Merge pull request #841 from oceanzus/redesign_sprint14_13254_rev

Reverts ticket 13254 to support Sprint 14 fixes to ZPLSC data fetching.
oceanobservatories · Aug 22, 2018 · 1571772 · 1571772
2 parents 78322f2 + 0d99a72
commit 1571772
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "0.8"
-  - "0.10"
+  - "7"
+script: 'true'
 before_install:
-  - npm install -g grunt-cli
+  - npm install -g grunt-cli
diff --git a/ooiui/static/js/partials/science/plot/PlotControls.html b/ooiui/static/js/partials/science/plot/PlotControls.html
@@ -50,11 +50,11 @@
                     <% //console.log(option.get('value')); %>
                     <% //console.log((model.get('ref_des').indexOf('ZPLSC') > -1) && (option.get('value') == 'xy')); %>
                     <!-- TODO: Remove this ZPLSC-specific check once we can retrieve data from uframe correctly -->
-                    <% if ((model.get('ref_des').indexOf('ZPLSC') > -1) && (option.get('value') == 'xy')){ %>
+                    <% //if ((model.get('ref_des').indexOf('ZPLSC') > -1) && (option.get('value') == 'xy')){ %>
                       <option value="<%=option.get('value')%>" <%= option.get('value') == plotModel.get('plotType') ? 'selected' : ''%>><%= option.get('name') %></option>
-                    <% }else if ((model.get('ref_des').indexOf('ZPLSC') === -1)){ %>
-                      <option value="<%=option.get('value')%>" <%= option.get('value') == plotModel.get('plotType') ? 'selected' : ''%>><%= option.get('name') %></option>
-                    <% } %>
+                    <% //}else if ((model.get('ref_des').indexOf('ZPLSC') === -1)){ %>
+                      <!--<option value="<%=option.get('value')%>" <%= option.get('value') == plotModel.get('plotType') ? 'selected' : ''%>><%= option.get('name') %></option>-->
+                    <% //} %>
                   <% }); %>
 
                 <% }else { %>

diff --git a/ooiui/static/json/uiPatchNotes.json b/ooiui/static/json/uiPatchNotes.json
@@ -1,4 +1,11 @@
 [
+    {
+        "VersionNumber": "1.4.10",
+        "VersionDate": "2018-07-24",
+        "VersionDescription": [
+            "Plotting: Reversion of ZPLSC XY-only plotting. (13254)"
+        ]
+    },
     {
         "VersionNumber": "1.4.9.3",
         "VersionDate": "2018-06-14",