From dc9ec27c17958dd7da5dce444f52fc296ee469d4 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Thu, 10 Jan 2019 01:58:05 -0500
Subject: [PATCH 1/2] Fix galaxy instance access in visualizations

---
 .../common/templates/chart_entry_point.mako   | 51 ++++++++-----------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/config/plugins/visualizations/common/templates/chart_entry_point.mako b/config/plugins/visualizations/common/templates/chart_entry_point.mako
index 13e64580391..2d328287996 100644
--- a/config/plugins/visualizations/common/templates/chart_entry_point.mako
+++ b/config/plugins/visualizations/common/templates/chart_entry_point.mako
@@ -9,15 +9,6 @@
     %endif
 </%def>
 <%def name="javascripts()">
-    <script type="text/javascript">
-        var Galaxy = Galaxy || parent.Galaxy || {
-            root    : '${h.url_for( "/" )}',
-            config  : {},
-            emit    : {
-                debug: function() {}
-            }
-        };
-    </script>
     ${h.js('libs/jquery/jquery',
            'libs/jquery/jquery-ui',
            'bundled/libs.chunk',
@@ -27,26 +18,28 @@
     <script type="text/javascript" src="${static_url}${src_path}"></script>
     <script type="text/javascript">
         $(function() {
-            var config = ${h.dumps(config)};
-            var load = "${script_attributes.get("load")}";
-            if (!bundleEntries[load]) {
-                load = "load";
-            }
-            if (!bundleEntries[load]) {
-                alert("Load function '" + load + "' not found.");
-            } else {
-                var app = bundleEntries.chart({
-                    visualization_id: ${h.dumps(visualization_id)} || undefined,
-                    visualization_name: ${h.dumps(visualization_name)},
-                    visualization_plugin: ${h.dumps(visualization_plugin)},
-                    dataset_id: config.dataset_id,
-                    chart_dict: config.chart_dict,
-                    chart_load: bundleEntries[load]
-                });
-                $('body').css("overflow", "hidden")
-                         .css("margin", 0)
-                         .append(app.$el);
-            }
+            config.addInitialization(function() {
+                let dump = ${h.dumps(config)};
+                var load = "${script_attributes.get("load")}";
+                if (!bundleEntries[load]) {
+                    load = "load";
+                }
+                if (!bundleEntries[load]) {
+                    alert("Load function '" + load + "' not found.");
+                } else {
+                    var app = bundleEntries.chart({
+                        visualization_id: ${h.dumps(visualization_id)} || undefined,
+                        visualization_name: ${h.dumps(visualization_name)},
+                        visualization_plugin: ${h.dumps(visualization_plugin)},
+                        dataset_id: dump.dataset_id,
+                        chart_dict: dump.chart_dict,
+                        chart_load: bundleEntries[load]
+                    });
+                    $('body').css("overflow", "hidden")
+                             .css("margin", 0)
+                             .append(app.$el);
+                }
+            });
         });
     </script>
 </%def>

From 68234cee299aaa20fdd4a2cdcbac0790c708ce01 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 10 Jan 2019 09:13:13 -0500
Subject: [PATCH 2/2] These don't need to be wrapped in a jquery onload

---
 .../common/templates/chart_entry_point.mako   | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/config/plugins/visualizations/common/templates/chart_entry_point.mako b/config/plugins/visualizations/common/templates/chart_entry_point.mako
index 2d328287996..2ec6e28303e 100644
--- a/config/plugins/visualizations/common/templates/chart_entry_point.mako
+++ b/config/plugins/visualizations/common/templates/chart_entry_point.mako
@@ -17,29 +17,27 @@
     <%src_path = script_attributes.get("src") %>
     <script type="text/javascript" src="${static_url}${src_path}"></script>
     <script type="text/javascript">
-        $(function() {
-            config.addInitialization(function() {
-                let dump = ${h.dumps(config)};
-                var load = "${script_attributes.get("load")}";
-                if (!bundleEntries[load]) {
-                    load = "load";
-                }
-                if (!bundleEntries[load]) {
-                    alert("Load function '" + load + "' not found.");
-                } else {
-                    var app = bundleEntries.chart({
-                        visualization_id: ${h.dumps(visualization_id)} || undefined,
-                        visualization_name: ${h.dumps(visualization_name)},
-                        visualization_plugin: ${h.dumps(visualization_plugin)},
-                        dataset_id: dump.dataset_id,
-                        chart_dict: dump.chart_dict,
-                        chart_load: bundleEntries[load]
-                    });
-                    $('body').css("overflow", "hidden")
-                             .css("margin", 0)
-                             .append(app.$el);
-                }
-            });
+        config.addInitialization(function() {
+            let dump = ${h.dumps(config)};
+            var load = "${script_attributes.get("load")}";
+            if (!bundleEntries[load]) {
+                load = "load";
+            }
+            if (!bundleEntries[load]) {
+                alert("Load function '" + load + "' not found.");
+            } else {
+                var app = bundleEntries.chart({
+                    visualization_id: ${h.dumps(visualization_id)} || undefined,
+                    visualization_name: ${h.dumps(visualization_name)},
+                    visualization_plugin: ${h.dumps(visualization_plugin)},
+                    dataset_id: dump.dataset_id,
+                    chart_dict: dump.chart_dict,
+                    chart_load: bundleEntries[load]
+                });
+                $('body').css("overflow", "hidden")
+                         .css("margin", 0)
+                         .append(app.$el);
+            }
         });
     </script>
 </%def>