Trackster app entrypoint fix.

galaxyproject · Nov 20, 2017 · 8d9998c · 8d9998c
1 parent e81d89f
commit 8d9998c
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 27 deletions.
diff --git a/client/galaxy/scripts/apps/trackster.js b/client/galaxy/scripts/apps/trackster.js
@@ -1,7 +1,7 @@
 import Trackster from "viz/trackster";
 
 export default function tracksterApp(options) {
-    new Trackster(options);
+    new Trackster.GalaxyApp(options);
 }
 
 window.tracksterApp = tracksterApp;
diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py
@@ -736,7 +736,7 @@ def trackster(self, trans, **kwargs):
         """
 
         # define app configuration
-        app = {'jscript' : "viz/trackster"}
+        app = {"jscript" : "tracksterApp"}
 
         # get dataset to add
         id = kwargs.get("id", None)
@@ -780,7 +780,7 @@ def trackster(self, trans, **kwargs):
             }
 
         # fill template
-        return trans.fill_template('galaxy.panels.mako', config={'right_panel': True, 'app': app})
+        return trans.fill_template('galaxy.panels.mako', config={'right_panel': True, 'app': app, 'bundle': 'trackster'})
 
     @web.expose
     def circster(self, trans, id=None, hda_ldda=None, dataset_id=None, dbkey=None):

diff --git a/static/scripts/bundled/admin.bundled.js b/static/scripts/bundled/admin.bundled.js
diff --git a/static/scripts/bundled/admin.bundled.js.map b/static/scripts/bundled/admin.bundled.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/bundled/login.bundled.js b/static/scripts/bundled/login.bundled.js
diff --git a/static/scripts/bundled/login.bundled.js.map b/static/scripts/bundled/login.bundled.js.map
diff --git a/static/scripts/bundled/masthead.bundled.js b/static/scripts/bundled/masthead.bundled.js
diff --git a/static/scripts/bundled/masthead.bundled.js.map b/static/scripts/bundled/masthead.bundled.js.map
diff --git a/static/scripts/bundled/trackster.bundled.js b/static/scripts/bundled/trackster.bundled.js
diff --git a/static/scripts/bundled/trackster.bundled.js.map b/static/scripts/bundled/trackster.bundled.js.map
diff --git a/static/scripts/bundled/workflow.bundled.js b/static/scripts/bundled/workflow.bundled.js
diff --git a/static/scripts/bundled/workflow.bundled.js.map b/static/scripts/bundled/workflow.bundled.js.map
diff --git a/templates/webapps/galaxy/galaxy.panels.mako b/templates/webapps/galaxy/galaxy.panels.mako
@@ -77,6 +77,10 @@
         'libs/require',
     )}
 
+    %if self.galaxy_config.get('bundle', None):
+        ${h.js('bundled/%s.bundled' % self.galaxy_config.get('bundle'))}
+    %endif
+
     <script type="text/javascript">
         // configure require
         // due to our using both script tags and require, we need to access the same jq in both for plugin retention
@@ -123,12 +127,10 @@
         // load any app configured
         define( 'app', function(){
             var jscript = galaxy_config.app.jscript;
-            if( jscript ){
-                require([ jscript ], function( js_lib ){
-                    $( function(){
-                        // load galaxy module application
-                        var module = new js_lib.default.GalaxyApp();
-                    });
+            if( galaxy_config.app.jscript && window[galaxy_config.app.jscript]){
+                $( function(){
+                    // load galaxy module application
+                    window[galaxy_config.app.jscript]();
                 });
             } else {
                 console.error("'galaxy_config.app.jscript' missing.");