Modified python templates

galaxyproject · Nov 10, 2018 · d4ab893 · d4ab893
1 parent 4ed27cf
commit d4ab893
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 27 deletions.
diff --git a/templates/base.mako b/templates/base.mako
@@ -66,14 +66,6 @@
         'bundled/extended.bundled'
     )}
 
-    <script type="text/javascript">
-        ## global configuration object
-        ## TODO: remove
-        window.Galaxy = window.Galaxy || {};
-        window.Galaxy.root = '${h.url_for( "/" )}';
-        window.Galaxy.config = {};
-    </script>
-
     %if not form_input_auto_focus is UNDEFINED and form_input_auto_focus:
         <script type="text/javascript">
             $(document).ready( function() {

diff --git a/templates/galaxy_client_app.mako b/templates/galaxy_client_app.mako
@@ -14,14 +14,19 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
             );
         %endfor
 
-        window.Galaxy = new window.top.bundleEntries.GalaxyApp({
-            root               : '${h.url_for( "/" )}',
-            config             : ${ render_json( get_config_dict() )},
-            user               : ${ render_json( get_user_dict() )},
-            session_csrf_token : '${ trans.session_csrf_token }'
-        }, bootstrapped );
+        var options = {
+            root: '${h.url_for( "/" )}',
+            config: ${ render_json( get_config_dict() )},
+            user: ${ render_json( get_user_dict() )},
+            session_csrf_token: '${ trans.session_csrf_token }'
+        };
+
+        window.bundleEntries.setGalaxyInstance(function(GalaxyApp) {
+            return new GalaxyApp(options, bootstrapped);
+        });
 
         %if app:
+            console.warn("Does app ever run? Is it ever not-named app?");
             require([ '${app}' ]);
         %endif
         

diff --git a/templates/js-app.mako b/templates/js-app.mako
@@ -63,12 +63,6 @@
     </script>
     %endif
 
-    <script type="text/javascript">
-        // this is needed *before* the app code is loaded - many MVC access Galaxy.root for their url
-        // TODO: change this by using a common Backbone.Model base class and url fn
-        window.Galaxy = { root: '${ options[ "root" ] }' };
-    </script>
-
     %if not form_input_auto_focus is UNDEFINED and form_input_auto_focus:
     <script type="text/javascript">
         $(document).ready( function() {

diff --git a/templates/webapps/galaxy/galaxy.masthead.mako b/templates/webapps/galaxy/galaxy.masthead.mako
@@ -37,9 +37,6 @@
 
     ## load the frame manager
     <script type="text/javascript">
-        if( !window.Galaxy ){
-            Galaxy = {};
-        }
 
         // if we're in an iframe, create styles that hide masthead/messagebox, and reset top for panels
         // note: don't use a link to avoid roundtrip request

diff --git a/templates/webapps/galaxy/galaxy.panels.mako b/templates/webapps/galaxy/galaxy.panels.mako
@@ -52,10 +52,7 @@
 </%def>
 
 <%def name="javascripts()">
-    <script>
-        window.Galaxy = window.Galaxy || {};
-        window.Galaxy.root = '${h.url_for( "/" )}';
-    </script>
+
     ## Send errors to Sentry server if configured
     %if app.config.sentry_dsn:
         ${h.js( "libs/raven" )}