From cc7f7cfcdaf2e016428710c831d705c62dab3642 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Mon, 16 Dec 2019 14:41:17 -0500
Subject: [PATCH] Simplify js loading -- yagni

---
 templates/base.mako                         |  8 ++------
 templates/base/base_panels.mako             |  9 ++-------
 templates/webapps/galaxy/galaxy.panels.mako | 13 ++++---------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/templates/base.mako b/templates/base.mako
index 51edb6ba812..de8fb791252 100644
--- a/templates/base.mako
+++ b/templates/base.mako
@@ -52,13 +52,9 @@
     ## TODO: remove when all libs are required directly in modules
     ${h.dist_js(
         'libs.chunk',
-        'base.chunk'
+        'base.chunk',
+        'generic.bundled'
     )}
-    ${self.javascript_entry()}
-</%def>
-
-<%def name="javascript_entry()">
-    ${h.dist_js('generic.bundled')}
 </%def>
 
 <%def name="javascript_app()">
diff --git a/templates/base/base_panels.mako b/templates/base/base_panels.mako
index bbd000b1f7a..f4a2dfe2252 100644
--- a/templates/base/base_panels.mako
+++ b/templates/base/base_panels.mako
@@ -35,14 +35,9 @@
     <!--- base/base_panels.mako javascripts() -->
     ${h.dist_js(
         'libs.chunk',
-        'base.chunk'
+        'base.chunk',
+        'generic.bundled'
     )}
-    ${ javascript_entry() }
-</%def>
-
-<%def name="javascript_entry()">
-    <!-- base/base_panels.mako javascript_entry -->
-    ${ h.dist_js('generic.bundled')}
 </%def>
 
 <%def name="javascript_app()">
diff --git a/templates/webapps/galaxy/galaxy.panels.mako b/templates/webapps/galaxy/galaxy.panels.mako
index 4968ca2d219..1bbfec58ddb 100644
--- a/templates/webapps/galaxy/galaxy.panels.mako
+++ b/templates/webapps/galaxy/galaxy.panels.mako
@@ -53,7 +53,7 @@
 
     <body scroll="no" class="full-content">
         <div id="everything">
-            
+
             <div id="background"></div>
 
             %if self.galaxy_config['master']:
@@ -177,20 +177,15 @@
     <!-- galaxy.panels.mako javascripts -->
     ${h.dist_js(
         'libs.chunk',
-        'base.chunk'
+        'base.chunk',
+        'generic.bundled'
     )}
-    ${self.javascript_entry()}
-</%def>
-
-<%def name="javascript_entry()">
-    <!-- galaxy.panels.mako javascript_entry -->
-    ${h.dist_js('generic.bundled')}
 </%def>
 
 <%def name="javascript_app()">
     <!-- galaxy.panels.mako javascript_app -->
     <script type="text/javascript">
-    
+
         var galaxyConfig = ${ h.dumps( self.galaxy_config ) };
 
         ## TODO: Some visualizations (and more?) currently use this config, should be refactored.