From 2083ce9ea0a513b3e3345c56a94fa0971d3381b1 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Tue, 28 Nov 2017 11:40:15 -0500
Subject: [PATCH] jquery-ui does not like loading.  jquery-ui-bundle handles
 this better, can easily be used as an import (we probably want to get rid of
 this stuff eventually, but it works for now)

---
 client/galaxy/scripts/mvc/ui/ui-slider.js                  | 1 +
 client/package.json                                        | 1 +
 client/yarn.lock                                           | 4 ++++
 .../plugins/visualizations/scatterplot/src/scatterplot.js  | 2 ++
 .../visualizations/scatterplot/templates/scatterplot.mako  | 3 ---
 .../plugins/visualizations/scatterplot/webpack.config.js   | 7 +++++++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/client/galaxy/scripts/mvc/ui/ui-slider.js b/client/galaxy/scripts/mvc/ui/ui-slider.js
index 45be78c6612..2b10bd62454 100644
--- a/client/galaxy/scripts/mvc/ui/ui-slider.js
+++ b/client/galaxy/scripts/mvc/ui/ui-slider.js
@@ -1,4 +1,5 @@
 import Utils from "utils/utils";
+
 var View = Backbone.View.extend({
     initialize: function(options) {
         var self = this;
diff --git a/client/package.json b/client/package.json
index c1acb43638a..efac95cbb96 100644
--- a/client/package.json
+++ b/client/package.json
@@ -20,6 +20,7 @@
     "jquery": "2",
     "jquery-migrate": "~1.4",
     "jquery-mousewheel": "^3.1.13",
+    "jquery-ui-bundle": "^1.12.1",
     "jquery.complexify": "^0.5.2",
     "jquery.cookie": "^1.4.1",
     "latex-parser": "^0.6.2",
diff --git a/client/yarn.lock b/client/yarn.lock
index 68d17073226..4b4cd79f60d 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4008,6 +4008,10 @@ jquery-mousewheel@^3.1.13:
   version "3.1.13"
   resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5"
 
+jquery-ui-bundle@^1.12.1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz#d6be2e4c377494e2378b1cae2920a91d1182d8c4"
+
 jquery.complexify@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/jquery.complexify/-/jquery.complexify-0.5.2.tgz#8c8834ca08cee9476f1d975128d49526adcc4ae9"
diff --git a/config/plugins/visualizations/scatterplot/src/scatterplot.js b/config/plugins/visualizations/scatterplot/src/scatterplot.js
index e57723650d6..5f5d85737d2 100644
--- a/config/plugins/visualizations/scatterplot/src/scatterplot.js
+++ b/config/plugins/visualizations/scatterplot/src/scatterplot.js
@@ -1,7 +1,9 @@
 import * as VisualizationModel from "mvc/visualization/visualization-model";
 import * as bootstrap from "bootstrap";
 import * as Backbone from "libs/backbone";
+import "jquery-ui-bundle";
 import * as d3 from "libs/d3";
+import "ui/peek-column-selector";
 
 /**
  *  Two Variable scatterplot visualization using d3
diff --git a/config/plugins/visualizations/scatterplot/templates/scatterplot.mako b/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
index 50bfafe5d9c..6b6ec066320 100644
--- a/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
+++ b/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
@@ -24,7 +24,6 @@ ${h.stylesheet_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
 
 ## ----------------------------------------------------------------------------
 <script type="text/javascript">
-// TODO: blah
 window.Galaxy = { root: '${ root }' };
 </script>
 ${h.js( 'libs/jquery/jquery',
@@ -66,8 +65,6 @@ ${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
                     embedded: "${embedded}"
                 }).render();
             display.fetchData();
-            //window.model = model;
-            //window.display = display;
         });
         </script>
 
diff --git a/config/plugins/visualizations/scatterplot/webpack.config.js b/config/plugins/visualizations/scatterplot/webpack.config.js
index f654187fbed..662bad7adbd 100644
--- a/config/plugins/visualizations/scatterplot/webpack.config.js
+++ b/config/plugins/visualizations/scatterplot/webpack.config.js
@@ -17,6 +17,13 @@ module.exports = {
             backbone: path.join(lroot, "backbone.js"),
         }
     },
+    resolveLoader: {
+        alias: {
+            // since we support both requirejs i18n and non-requirejs and both use a similar syntax,
+            // use an alias so we can just use one file
+            i18n: "amdi18n-loader"
+        }
+    },
     module: {
         rules: [
             {