From ff84aa42706621fee4a6658745bb0fa1a19c19e1 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 26 Jan 2018 14:21:32 -0500 Subject: [PATCH] Use default load function for chart plugins --- .../scripts/mvc/visualization/chart/chart-client.js | 2 +- .../scripts/mvc/visualization/chart/views/viewport.js | 2 +- .../common/templates/chart_entry_point.mako | 8 ++++---- .../plugins/visualizations/cytoscape/config/cytoscape.xml | 2 +- config/plugins/visualizations/cytoscape/src/script.js | 2 +- config/plugins/visualizations/drawrna/src/script.js | 2 +- static/style/blue/base.css | 4 ++++ 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/client/galaxy/scripts/mvc/visualization/chart/chart-client.js b/client/galaxy/scripts/mvc/visualization/chart/chart-client.js index 9d48b80aff1..0b38e3199d7 100644 --- a/client/galaxy/scripts/mvc/visualization/chart/chart-client.js +++ b/client/galaxy/scripts/mvc/visualization/chart/chart-client.js @@ -17,7 +17,7 @@ export default Backbone.View.extend({ this.chart = new Chart({}, options); this.chart.plugin = options.visualization_plugin; this.chart.plugin.specs = this.chart.plugin.specs || {}; - this.chart_func = options.chart_func; + this.chart_load = options.chart_load; this.deferred = new Deferred(); this.viewer = new Viewer(this); this.editor = new Editor(this); diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/viewport.js b/client/galaxy/scripts/mvc/visualization/chart/views/viewport.js index ac2800478b5..35627a4ac0f 100644 --- a/client/galaxy/scripts/mvc/visualization/chart/views/viewport.js +++ b/client/galaxy/scripts/mvc/visualization/chart/views/viewport.js @@ -95,6 +95,6 @@ export default Backbone.View.extend({ var n_panels = chart.settings.get("__use_panels") == "true" ? chart.groups.length : 1; this._createContainer(chart.plugin.specs.tag, n_panels); chart.state("wait", "Please wait..."); - this.app.chart_func({ process: process, chart: chart, dataset: this.app.dataset, targets: this.targets }); + this.app.chart_load({ process: process, chart: chart, dataset: this.app.dataset, targets: this.targets }); } }); diff --git a/config/plugins/visualizations/common/templates/chart_entry_point.mako b/config/plugins/visualizations/common/templates/chart_entry_point.mako index 80a834d6ea8..a2a6d6ae055 100644 --- a/config/plugins/visualizations/common/templates/chart_entry_point.mako +++ b/config/plugins/visualizations/common/templates/chart_entry_point.mako @@ -26,9 +26,9 @@