From f5fbe1c5020fb432346ce6340833937d13cbf6d0 Mon Sep 17 00:00:00 2001 From: carlfeberhard Date: Thu, 21 Jan 2016 13:38:12 -0500 Subject: [PATCH] Client: remove older compiled backbone/backbone.js, update scatterplot and charts for same; Visualizations: fix visualization-model url; Scatterplot: fix title bug and Galaxy var --- .../scripts/mvc/visualization/visualization-model.js | 2 +- config/plugins/visualizations/charts/Gruntfile.js | 2 +- .../visualizations/charts/static/build-app.js | 2 +- .../visualizations/charts/templates/charts.mako | 12 ++++++------ .../scatterplot/templates/scatterplot.mako | 10 +++++++--- static/maps/libs/backbone/backbone.js.map | 1 - .../mvc/visualization/visualization-model.js.map | 2 +- static/scripts/libs/backbone/backbone.js | 2 -- .../scripts/mvc/visualization/visualization-model.js | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 static/maps/libs/backbone/backbone.js.map delete mode 100644 static/scripts/libs/backbone/backbone.js diff --git a/client/galaxy/scripts/mvc/visualization/visualization-model.js b/client/galaxy/scripts/mvc/visualization/visualization-model.js index cb4179de734..6c2f9ded47c 100644 --- a/client/galaxy/scripts/mvc/visualization/visualization-model.js +++ b/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; }, diff --git a/config/plugins/visualizations/charts/Gruntfile.js b/config/plugins/visualizations/charts/Gruntfile.js index 6ece32d752f..c7dd80ff3cd 100644 --- a/config/plugins/visualizations/charts/Gruntfile.js +++ b/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", diff --git a/config/plugins/visualizations/charts/static/build-app.js b/config/plugins/visualizations/charts/static/build-app.js index 751032751c3..a71ee348feb 100644 --- a/config/plugins/visualizations/charts/static/build-app.js +++ b/config/plugins/visualizations/charts/static/build-app.js @@ -1 +1 @@ -define("mvc/ui/ui-modal",[],function(){var e=Backbone.View.extend({elMain:"body",optionsDefault:{title:"ui-modal",body:"",backdrop:!0,height:null,width:null,closing_events:!1,closing_callback:null,title_separator:!0},buttonList:{},initialize:function(e){e&&this._create(e)},show:function(e){this.initialize(e),this.options.height?(this.$body.css("height",this.options.height),this.$body.css("overflow","hidden")):this.$body.css("max-height",$(window).height()/2),this.options.width&&this.$dialog.css("width",this.options.width),this.visible?this.$el.show():this.$el.fadeIn("fast"),this.visible=!0},hide:function(){this.visible=!1,this.$el.fadeOut("fast"),this.options.closing_callback&&this.options.closing_callback()},enableButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).prop("disabled",!1)},disableButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).prop("disabled",!0)},showButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).show()},hideButton:function(e){var t=this.buttonList[e];this.$buttons.find("#"+t).hide()},getButton:function(e){var t=this.buttonList[e];return this.$buttons.find("#"+t)},scrollTop:function(){return this.$body.scrollTop()},_create:function(e){var t=this;if(this.options=_.defaults(e,this.optionsDefault),"progress"==this.options.body&&(this.options.body=$('
')),this.$el&&(this.$el.remove(),$(document).off("keyup.ui-modal")),this.setElement(this._template(this.options.title)),this.$dialog=this.$el.find(".modal-dialog"),this.$body=this.$el.find(".modal-body"),this.$footer=this.$el.find(".modal-footer"),this.$buttons=this.$el.find(".buttons"),this.$backdrop=this.$el.find(".modal-backdrop"),this.$body.html(this.options.body),this.options.backdrop||this.$backdrop.removeClass("in"),this.options.buttons){this.buttonList={};var n=0;$.each(this.options.buttons,function(e,r){var i="button-"+n++;t.$buttons.append($('').text(e).click(r)).append(" "),t.buttonList[e]=i})}else this.$footer.hide();$(this.elMain).append($(this.el)),this.options.closing_events&&($(document).on("keyup.ui-modal",function(e){27==e.keyCode&&t.hide()}),this.$el.find(".modal-backdrop").on("click",function(){t.hide()})),this.options.title_separator||this.$(".modal-header").css({border:"none","padding-bottom":"0px"})},_template:function(e){return'