Bundle sweepster.

galaxyproject · Dec 13, 2017 · f028957 · f028957
1 parent a3b25a3
commit f028957
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/client/galaxy/scripts/apps/extended.js b/client/galaxy/scripts/apps/extended.js
@@ -3,6 +3,7 @@ import WorkflowView from "mvc/workflow/workflow-view";
 import Trackster from "viz/trackster";
 import Circster from "viz/circster";
 import Phyloviz from "viz/phyloviz";
+import Sweepster from "viz/sweepster";
 import GalaxyLibrary from "galaxy.library";
 import AdminToolshed from "admin.toolshed";
 import Masthead from "layout/masthead";
@@ -173,10 +174,11 @@ export const bundleEntries = {
     history: historyEntry,
     History: History.History,
     HistoryContents: HistoryContents.HistoryContents,
+    SweepsterVisualization: Sweepster.SweepsterVisualization,
+    SweepsterVisualizationView: Sweepster.SweepsterVisualizationView,
     HistoryCopyDialog,
     HistoryViewAnnotated,
     Trackster
 };
 
-console.debug(bundleEntries);
 window.bundleEntries = bundleEntries;
diff --git a/templates/webapps/galaxy/visualization/sweepster.mako b/templates/webapps/galaxy/visualization/sweepster.mako
@@ -109,31 +109,13 @@
     ${h.js( "libs/jquery/jquery-ui" )}
 
     <script type="text/javascript">
-        // require.config({
-        //     baseUrl: "${h.url_for('/static/scripts') }",
-        //     shim: {
-        //         "libs/underscore": { exports: "_" },
-        //         "libs/backbone": {
-        //             deps: [ 'jquery', 'libs/underscore' ],
-        //             exports: "Backbone"
-        //         },
-        //         "libs/d3": { exports: "d3" },
-        //     },
-        //     // cache buster based on templated server (re)start time
-        //     urlArgs: 'v=${app.server_starttime}'
-        // });
-
-        require(["viz/sweepster"], function(sweepster) {
-
-            var viz;
-            $(function() {
-                // -- Viz set up. --
-                var viz = new sweepster.default.SweepsterVisualization(
-                    ${ h.dumps( config )}
-                );
-                var viz_view = new sweepster.default.SweepsterVisualizationView({ model: viz });
-                viz_view.render();
-            });
+        $(function() {
+            // -- Viz set up. --
+            var viz = new window.bundleEntries.SweepsterVisualization(
+                ${ h.dumps( config )}
+            );
+            var viz_view = new window.bundleEntries.SweepsterVisualizationView({ model: viz });
+            viz_view.render();
         });
     </script>
 </%def>