From 3a532ad8e8fee5045a5d31e9f5e06d714216bb69 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Tue, 28 Nov 2017 11:01:40 -0500
Subject: [PATCH] Bootstrap.js bug was preventing loading the 'correct' way;
 resolved with an update.

---
 .../scripts/mvc/visualization/visualization-model.js   |  1 +
 client/package.json                                    |  3 ++-
 client/yarn.lock                                       |  4 ++++
 .../visualizations/scatterplot/src/scatterplot.js      |  3 +++
 .../scatterplot/templates/scatterplot.mako             | 10 +++-------
 .../visualizations/scatterplot/webpack.config.js       |  8 ++++----
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/client/galaxy/scripts/mvc/visualization/visualization-model.js b/client/galaxy/scripts/mvc/visualization/visualization-model.js
index 4129266c781..40b56109554 100644
--- a/client/galaxy/scripts/mvc/visualization/visualization-model.js
+++ b/client/galaxy/scripts/mvc/visualization/visualization-model.js
@@ -1,3 +1,4 @@
+import * as Backbone from "libs/backbone";
 //==============================================================================
 /** @class Model for a saved Galaxy visualization.
  *
diff --git a/client/package.json b/client/package.json
index 2ce8f22e76f..c1acb43638a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -15,6 +15,7 @@
     "axios": "^0.17.0",
     "backbone": "1.3",
     "bibtex-parse-js": "^0.0.24",
+    "bootstrap": "^3.3.7",
     "d3": "3",
     "jquery": "2",
     "jquery-migrate": "~1.4",
@@ -47,7 +48,7 @@
     "build-toolshed": "grunt --app=toolshed",
     "jshint": "jshint --exclude='galaxy/scripts/libs/**' galaxy/scripts/**/*.js",
     "build-charts": "webpack -p --config ../config/plugins/visualizations/charts/webpack.config.js",
-    "build-scatterplot": "NODE_PATH=./node_modules webpack -d --config ../config/plugins/visualizations/scatterplot/webpack.config.js",
+    "build-scatterplot": "NODE_PATH=./node_modules webpack -p --config ../config/plugins/visualizations/scatterplot/webpack.config.js",
     "prettier": "prettier --write --tab-width 4 --print-width 120 \"galaxy/scripts/{,!(libs)/**/}/*.js\""
   },
   "devDependencies": {
diff --git a/client/yarn.lock b/client/yarn.lock
index 536d7e65b64..68d17073226 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1142,6 +1142,10 @@ boom@5.x.x:
   dependencies:
     hoek "4.x.x"
 
+bootstrap@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"
+
 bower@~1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.2.tgz#adf53529c8d4af02ef24fb8d5341c1419d33e2f7"
diff --git a/config/plugins/visualizations/scatterplot/src/scatterplot.js b/config/plugins/visualizations/scatterplot/src/scatterplot.js
index 7eb8cea7cac..e57723650d6 100644
--- a/config/plugins/visualizations/scatterplot/src/scatterplot.js
+++ b/config/plugins/visualizations/scatterplot/src/scatterplot.js
@@ -1,4 +1,7 @@
 import * as VisualizationModel from "mvc/visualization/visualization-model";
+import * as bootstrap from "bootstrap";
+import * as Backbone from "libs/backbone";
+import * as d3 from "libs/d3";
 
 /**
  *  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 91d9563360e..50bfafe5d9c 100644
--- a/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
+++ b/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
@@ -28,15 +28,11 @@ ${h.stylesheet_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
 window.Galaxy = { root: '${ root }' };
 </script>
 ${h.js( 'libs/jquery/jquery',
-        'libs/jquery/jquery-ui',
-        'libs/require',
-        'libs/bootstrap',
         'libs/underscore',
-        'libs/backbone',
         'libs/d3')}
-
 ${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterplot.bundle.js' )}
-    <script type="text/javascript">
+
+<script type="text/javascript">
     function getModel(){
         return new ScatterplotModel({
             id      : ${h.dumps( visualization_id )} || undefined,
@@ -48,7 +44,7 @@ ${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
         return ${h.dumps( trans.security.encode_dict_ids( hda.to_dict() ), indent=2 )};
     }
     window.jQuery = window.jquery = window.$;
-    </script>
+</script>
 
 </head>
 
diff --git a/config/plugins/visualizations/scatterplot/webpack.config.js b/config/plugins/visualizations/scatterplot/webpack.config.js
index 40cab463bec..f654187fbed 100644
--- a/config/plugins/visualizations/scatterplot/webpack.config.js
+++ b/config/plugins/visualizations/scatterplot/webpack.config.js
@@ -14,7 +14,7 @@ module.exports = {
         alias: {
             jquery: path.join(lroot, "jquery/jquery"),
             underscore: path.join(lroot, "underscore.js"),
-            backbone: path.join(lroot, "backbone.js")
+            backbone: path.join(lroot, "backbone.js"),
         }
     },
     module: {
@@ -28,9 +28,9 @@ module.exports = {
     },
     plugins: [
         new webpack.ProvidePlugin({
-            $: "jquery",
-            _: "underscore",
-            Backbone: "backbone"
+            jquery: "jquery",
+            jQuery: "jquery",
+            $: "jquery"
         })
     ]
 };