From c72e7776e869f3e4b212424115b39e9924fcd117 Mon Sep 17 00:00:00 2001
From: James Case <case@oceanz.org>
Date: Tue, 24 Jul 2018 09:08:44 -0400
Subject: [PATCH 1/3] Reverts ticket 13254 to support Sprint 14 fixes to ZPLSC
 data fetching.

---
 ooiui/static/js/partials/science/plot/PlotControls.html | 8 ++++----
 ooiui/static/json/uiPatchNotes.json                     | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ooiui/static/js/partials/science/plot/PlotControls.html b/ooiui/static/js/partials/science/plot/PlotControls.html
index 404ac4351..f880ccb2d 100644
--- 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
index ab1dc15c9..9c45f9288 100644
--- 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",

From 8f95da3cc9902dc4f4c710cc9c0e99970c4a5260 Mon Sep 17 00:00:00 2001
From: James Case <case@oceanz.org>
Date: Wed, 22 Aug 2018 11:46:44 -0400
Subject: [PATCH 2/3] Turns off tests, which do not exist. New error out of
 Travis that never happened before.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f2c257a22..89f722f05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,6 @@ language: node_js
 node_js:
   - "0.8"
   - "0.10"
+script: 'true'
 before_install:
   - npm install -g grunt-cli
\ No newline at end of file

From 0d99a72c4edcbd71b111877de4a479e43dabb7ed Mon Sep 17 00:00:00 2001
From: James Case <case@oceanz.org>
Date: Wed, 22 Aug 2018 13:20:43 -0400
Subject: [PATCH 3/3] Update .travis.yml

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 89f722f05..a637a9ff5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: node_js
 node_js:
-  - "0.8"
-  - "0.10"
+  - "7"
 script: 'true'
 before_install:
-  - npm install -g grunt-cli
\ No newline at end of file
+  - npm install -g grunt-cli