From a4899ae9b32ea081bac02dbc7e4b93c64ae6c6f6 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 15 Dec 2017 14:37:40 -0500
Subject: [PATCH] Some bundle import reorg in old-style 'base' templates; we
 basically always want to load the bundle entrypoints here.

---
 templates/base.mako                       | 1 +
 templates/base/base_panels.mako           | 1 +
 templates/webapps/galaxy/base_panels.mako | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/base.mako b/templates/base.mako
index ec83c882f8c..5a9b29d646e 100644
--- a/templates/base.mako
+++ b/templates/base.mako
@@ -61,6 +61,7 @@
         ## TODO: remove when all libs are required directly in modules
         'bundled/libs.bundled',
         'libs/require',
+        'bundled/extended.bundled'
     )}
 
     <script type="text/javascript">
diff --git a/templates/base/base_panels.mako b/templates/base/base_panels.mako
index 14d6e1bede5..c55af74cb2e 100644
--- a/templates/base/base_panels.mako
+++ b/templates/base/base_panels.mako
@@ -54,6 +54,7 @@
         ## TODO: remove when all libs are required directly in modules
         'bundled/libs.bundled',
         'libs/require',
+        'bundled/extended.bundled'
     )}
 
     <script type="text/javascript">
diff --git a/templates/webapps/galaxy/base_panels.mako b/templates/webapps/galaxy/base_panels.mako
index 09219550499..dc3fa31e8be 100644
--- a/templates/webapps/galaxy/base_panels.mako
+++ b/templates/webapps/galaxy/base_panels.mako
@@ -7,7 +7,6 @@
 
 <%def name="javascripts()">
 ${parent.javascripts()}
-${h.js("bundled/extended.bundled")}
 </%def>
 
 <%def name="late_javascripts()">