diff --git a/.hgtags b/.hgtags index 6ca402c45c9..fa371c7744d 100644 --- a/.hgtags +++ b/.hgtags @@ -9,4 +9,4 @@ a4113cc1cb5eaa68091c9a73375f00555b66dd11 release_2013.01.13 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14 68a8b0397947c732b28207d465d3f3c4e2a7a8a0 latest_2014.04.14 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02 -9b78595ec1142d75930dbfffd8baeaa689cb4c6c latest_2014.06.02 +8a863a311a6c9f14b302799bffcf94df9186fef7 latest_2014.06.02 diff --git a/config/plugins/visualizations/charts/static/app.js b/config/plugins/visualizations/charts/static/app.js index 96b289d3aaf..215e0c67840 100644 --- a/config/plugins/visualizations/charts/static/app.js +++ b/config/plugins/visualizations/charts/static/app.js @@ -1,26 +1,26 @@ // dependencies define(['mvc/ui/ui-modal', 'mvc/ui/ui-portlet', 'plugin/library/ui', 'utils/utils', - 'plugin/library/jobs', 'plugin/library/datasets', 'plugin/library/storage', + 'plugin/library/jobs', 'plugin/library/datasets', 'plugin/library/storage', 'plugin/library/deferred', 'plugin/views/viewer', 'plugin/views/editor', 'plugin/models/config', 'plugin/models/chart', 'plugin/charts/types'], - function( Modal, Portlet, Ui, Utils, Jobs, Datasets, Storage, + function( Modal, Portlet, Ui, Utils, Jobs, Datasets, Storage, Deferred, ViewerView, EditorView, Config, Chart, Types ) { -// widget -return Backbone.View.extend( -{ +/** + * Main application class. + */ +return Backbone.View.extend({ // initialize - initialize: function(options) - { + initialize: function(options){ // deactivate all debugs outputs //window.console.debug = function() {}; // link options this.options = options; - + // link galaxy modal or create one if (Galaxy && Galaxy.modal) { this.modal = Galaxy.modal; @@ -41,6 +41,7 @@ return Backbone.View.extend( this.jobs = new Jobs(this); this.datasets = new Datasets(this); this.storage = new Storage(this); + this.deferred = new Deferred(); // // views @@ -62,7 +63,7 @@ return Backbone.View.extend( // draw chart var self = this; - this.chart.deferred.execute(function() { + this.deferred.execute(function() { self.chart.trigger('redraw'); }); } @@ -100,19 +101,6 @@ return Backbone.View.extend( console.debug('FAILED App:chartPath() - Invalid format: ' + chart_type); } return undefined; - }, - - // execute command - execute: function(options) { - }, - - // unload - onunload: function() { - }, - - // log - log: function(location, message) { - console.log(location + ' ' + message); } }); diff --git a/config/plugins/visualizations/charts/static/build-app.js b/config/plugins/visualizations/charts/static/build-app.js index efedde934fb..6604eda13b5 100644 --- a/config/plugins/visualizations/charts/static/build-app.js +++ b/config/plugins/visualizations/charts/static/build-app.js @@ -3,4 +3,4 @@ // (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc. // Underscore may be freely distributed under the MIT license. -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},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;this.options=_.defaults(e,this.optionsDefault),this.options.body=="progress"&&(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");if(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){e.keyCode==27&&t.hide()}),this.$el.find(".modal-backdrop").on("click",function(){t.hide()}))},_template:function(e){return'