Rename request dictionary builder

galaxyproject · Aug 20, 2016 · 18eb032 · 18eb032
1 parent 13d35ba
commit 18eb032
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/config/plugins/visualizations/charts/static/charts/jqplot/boxplot/wrapper.js b/config/plugins/visualizations/charts/static/charts/jqplot/boxplot/wrapper.js
@@ -1,7 +1,7 @@
 define( [ 'plugin/charts/jqplot/common/wrapper', 'plugin/charts/utilities' ], function( Plot, Utilities ) {
     return Backbone.View.extend({
         initialize: function( app, options ) {
-            var request_dictionary = Utilities.tabularRequestDictionary( app.chart );
+            var request_dictionary = Utilities.buildRequestDictionary( app.chart );
             var chart = options.chart;
             var index = 0;
             for ( var i in request_dictionary.groups ) {

diff --git a/config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/wrapper.js b/config/plugins/visualizations/charts/static/charts/jqplot/histogram_discrete/wrapper.js
@@ -1,7 +1,7 @@
 define( [ 'plugin/charts/utilities', 'plugin/charts/jqplot/common/wrapper' ], function( Utilities, Plot ) {
     return Backbone.Model.extend({
         initialize: function( app, options ) {
-            var request_dictionary = Utilities.tabularRequestDictionary( options.chart );
+            var request_dictionary = Utilities.buildRequestDictionary( app.chart );
             var index = 1;
             var tmp_dict = { id : request_dictionary.id, groups : [] };
             for ( var group_index in request_dictionary.groups ) {

diff --git a/config/plugins/visualizations/charts/static/charts/nvd3/histogram/wrapper.js b/config/plugins/visualizations/charts/static/charts/nvd3/histogram/wrapper.js
@@ -2,7 +2,7 @@ define( [ 'plugin/charts/utilities', 'plugin/library/jobs', 'plugin/charts/nvd3/
     return Backbone.Model.extend({
         initialize: function( app, options ) {
             Jobs.request( app, 'histogram', function( dataset ) {
-                options.request_dictionary = Utilities.tabularRequestDictionary( app.chart, dataset.id );
+                options.request_dictionary = Utilities.buildRequestDictionary( app.chart, dataset.id );
                 var index = 1;
                 _.each( options.request_dictionary.groups, function( group ) {
                     group.columns = { x : { index : 0, is_numeric : true },

diff --git a/config/plugins/visualizations/charts/static/charts/nvd3/pie/wrapper.js b/config/plugins/visualizations/charts/static/charts/nvd3/pie/wrapper.js
@@ -3,8 +3,8 @@ define( [ 'utils/utils', 'plugin/charts/utilities' ], function( Utils, Utilities
     return Backbone.View.extend({
         initialize: function( app, options ) {
             var self = this;
-            var chart = options.chart;
-            var request_dictionary = Utilities.tabularRequestDictionary( chart );
+            var chart = app.chart;
+            var request_dictionary = Utilities.buildRequestDictionary( app.chart );
             var canvas_list = options.canvas_list;
             var process = options.process;
             request_dictionary.success = function() {

diff --git a/config/plugins/visualizations/charts/static/charts/others/heatmap_cluster/wrapper.js b/config/plugins/visualizations/charts/static/charts/others/heatmap_cluster/wrapper.js
@@ -1,7 +1,7 @@
 define( [ 'plugin/charts/utilities', 'plugin/charts/others/heatmap/heatmap-plugin' ], function( Utilities, HeatMap ) {
     return Backbone.View.extend({
         initialize: function(app, options) {
-            var request_dictionary = Utilities.tabularRequestDictionary( options.chart );
+            var request_dictionary = Utilities.buildRequestDictionary( app.chart );
             var index = 0;
             var tmp_dict = { id : request_dictionary.id, groups : [] };
             for ( var group_index in request_dictionary.groups ) {

diff --git a/config/plugins/visualizations/charts/static/charts/utilities.js b/config/plugins/visualizations/charts/static/charts/utilities.js
@@ -1,7 +1,7 @@
 define( [ 'utils/utils' ], function( Utils ) {
 
     /** Create default data request dictionary */
-    function tabularRequestDictionary( chart, dataset_id ) {
+    function buildRequestDictionary( chart, dataset_id ) {
         var request_dictionary = { groups : [] };
         request_dictionary.id = dataset_id ? dataset_id : chart.get( 'dataset_id' );
         var group_index = 0;
@@ -23,7 +23,7 @@ define( [ 'utils/utils' ], function( Utils ) {
         var self = this;
         var process             = options.process;
         var chart               = options.chart;
-        var request_dictionary  = options.request_dictionary || tabularRequestDictionary( options.chart );
+        var request_dictionary  = options.request_dictionary || buildRequestDictionary( app.chart );
         var render              = options.render;
         var canvas_list         = options.canvas_list;
         request_dictionary.query_limit = chart.definition.query_limit;
@@ -281,8 +281,8 @@ define( [ 'utils/utils' ], function( Utils ) {
     };
 
     return {
+        buildRequestDictionary  : buildRequestDictionary,
         panelHelper             : panelHelper,
-        tabularRequestDictionary: tabularRequestDictionary,
         makeCategories          : makeCategories,
         makeUniqueCategories    : makeUniqueCategories,
         makeSeries              : makeSeries,