Remove unused config

galaxyproject · Aug 22, 2016 · 3e00f7a · 3e00f7a
1 parent d0efd5f
commit 3e00f7a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 20 deletions.
diff --git a/config/plugins/visualizations/charts/static/app.js b/config/plugins/visualizations/charts/static/app.js
@@ -1,17 +1,12 @@
 /**
  *  Main application class.
  */
-define( [ 'mvc/ui/ui-modal', 'mvc/ui/ui-portlet', 'mvc/ui/ui-misc', 'utils/utils',
-          'plugin/library/storage', 'utils/deferred',
-          'plugin/views/viewer', 'plugin/views/editor',
-          'plugin/models/config', 'plugin/models/chart', 'plugin/charts/types' ],
-        function( Modal, Portlet, Ui, Utils, Storage, Deferred,
-                  ViewerView, EditorView, Config, Chart, Types ) {
+define( [ 'mvc/ui/ui-modal', 'mvc/ui/ui-portlet', 'mvc/ui/ui-misc', 'utils/utils', 'plugin/components/storage', 'plugin/components/model', 'utils/deferred', 'plugin/views/viewer', 'plugin/views/editor', 'plugin/charts/types' ],
+    function( Modal, Portlet, Ui, Utils, Storage, Chart, Deferred, ViewerView, EditorView, Types ) {
     return Backbone.View.extend({
         initialize: function(options){
             this.options = options;
             this.modal = parent.Galaxy && parent.Galaxy.modal || new Modal.View();
-            this.config = new Config();
             this.types = new Types();
             this.chart = new Chart();
             this.storage = new Storage( this );

diff --git a/...ualizations/charts/static/models/chart.js → ...zations/charts/static/components/model.js b/...ualizations/charts/static/models/chart.js → ...zations/charts/static/components/model.js
diff --git a/...tions/charts/static/library/screenshot.js → ...ns/charts/static/components/screenshot.js b/...tions/charts/static/library/screenshot.js → ...ns/charts/static/components/screenshot.js
diff --git a/...izations/charts/static/library/storage.js → ...tions/charts/static/components/storage.js b/...izations/charts/static/library/storage.js → ...tions/charts/static/components/storage.js
@@ -1,5 +1,5 @@
 /** This class saves and loads a chart through the api. */
-define( [ 'utils/utils', 'plugin/models/chart', 'mvc/visualization/visualization-model' ], function( Utils, Chart ) {
+define( [ 'utils/utils', 'plugin/components/model', 'mvc/visualization/visualization-model' ], function( Utils, Chart ) {
     return Backbone.Model.extend({
 
         initialize: function( app ) {

diff --git a/config/plugins/visualizations/charts/static/models/config.js b/config/plugins/visualizations/charts/static/models/config.js
diff --git a/config/plugins/visualizations/charts/static/views/editor.js b/config/plugins/visualizations/charts/static/views/editor.js
@@ -2,9 +2,8 @@
  *  The charts editor holds the tabs for selecting chart types, chart configuration
  *  and data group selections.
  */
-define( [ 'mvc/ui/ui-tabs', 'mvc/ui/ui-misc', 'mvc/ui/ui-portlet', 'utils/utils',
-          'plugin/models/chart', 'plugin/views/settings', 'plugin/views/groups', 'plugin/views/types' ],
-    function( Tabs, Ui, Portlet, Utils, Chart, SettingsView, GroupsView, TypesView ) {
+define( [ 'mvc/ui/ui-tabs', 'mvc/ui/ui-misc', 'mvc/ui/ui-portlet', 'utils/utils', 'plugin/views/settings', 'plugin/views/groups', 'plugin/views/types' ],
+    function( Tabs, Ui, Portlet, Utils, SettingsView, GroupsView, TypesView ) {
     return Backbone.View.extend({
         initialize: function( app, options ){
             var self = this;

diff --git a/config/plugins/visualizations/charts/static/views/viewer.js b/config/plugins/visualizations/charts/static/views/viewer.js
@@ -1,6 +1,6 @@
 /** This class renders the chart viewer which encapsulates the chart viewport. */
 define( [ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/ui/ui-portlet',
-          'plugin/views/viewport', 'plugin/library/screenshot' ],
+          'plugin/views/viewport', 'plugin/components/screenshot' ],
           function( Utils, Ui, Portlet, ViewportView, Screenshot ) {
     return Backbone.View.extend({
         initialize: function(app, options){