[16.01] Fix redundant backbone and visualizations

client/galaxy/scripts/mvc/visualization/visualization-model.js

@@ -21,7 +21,7 @@ var Visualization = Backbone.Model.extend(
 
     /** override urlRoot to handle prefix */
     urlRoot : function(){
-        var apiUrl = '/api/visualizations';
+        var apiUrl = 'api/visualizations';
         return Galaxy.root + apiUrl;
     },
 

config/plugins/visualizations/charts/Gruntfile.js

@@ -11,7 +11,7 @@ module.exports = function(grunt) {
                     },
                     shim    : {
                         "libs/underscore": { exports: "_" },
-                        "libs/backbone/backbone": { exports: "Backbone" }
+                        "libs/backbone": { exports: "Backbone" }
                     },
                     name    : "plugin/app",
                     out     : "static/build-app.js",

config/plugins/visualizations/charts/templates/charts.mako

@@ -15,7 +15,7 @@
                 'libs/jquery/select2',
                 'libs/bootstrap',
                 'libs/underscore',
-                'libs/backbone/backbone',
+                'libs/backbone',
                 'libs/d3',
                 'libs/require')}
 
@@ -39,7 +39,7 @@
 
         ## load merged/minified code
         ${h.javascript_link( app_root + "build-app.js" )}
-        
+
         ## install default css
         ${h.stylesheet_link( app_root + "app.css" )}
     </head>
@@ -79,7 +79,7 @@
                 },
                 shim: {
                     "libs/underscore": { exports: "_" },
-                    "libs/backbone/backbone": { exports: "Backbone" },
+                    "libs/backbone": { exports: "Backbone" },
                     "d3": { exports: "d3"}
 
                 }
@@ -89,18 +89,18 @@
             };
             // application
             var app = null;
-            $(function() {   
+            $(function() {
                 // request application script
                 require(['plugin/app'], function(App) {
                     // load options
                     var options = {
                         id      : ${h.dumps( visualization_id )} || undefined,
                         config  : ${h.dumps( config )}
                     }
-                    
+
                     // create application
                     app = new App(options);
-                    
+
                     // add to body
                     $('body').append(app.$el);
                 });

config/plugins/visualizations/scatterplot/templates/scatterplot.mako

@@ -23,12 +23,16 @@ ${h.css( 'base', 'jquery-ui/smoothness/jquery-ui')}
 ${h.stylesheet_link( root + 'plugins/visualizations/scatterplot/static/scatterplot.css' )}
 
 ## ----------------------------------------------------------------------------
+<script type="text/javascript">
+// TODO: blah
+window.Galaxy = { root: '${ root }' };
+</script>
 ${h.js( 'libs/jquery/jquery',
         'libs/jquery/jquery.migrate',
         'libs/jquery/jquery-ui',
         'libs/bootstrap',
         'libs/underscore',
-        'libs/backbone/backbone',
+        'libs/backbone',
         'libs/d3',
         'libs/handlebars.runtime',
         'ui/peek-column-selector',
@@ -41,7 +45,7 @@ ${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
 function getModel(){
     return new ScatterplotModel({
         id      : ${h.dumps( visualization_id )} || undefined,
-        title   : "${title}",
+        title   : "${title or default_title}",
         config  : ${h.dumps( config, indent=2 )}
     });
 }
@@ -88,7 +92,7 @@ function getHDAJSON(){
                 hdaJSON = getHDAJSON(),
                 editor  = new ScatterplotConfigEditor({
                     el      : $( '.scatterplot-editor' ).attr( 'id', 'scatterplot-editor-hda-' + hdaJSON.id ),
-                    model   : getModel(),
+                    model   : model,
                     dataset : hdaJSON
                 }).render();
             window.editor = editor;