From 19e643e12cc344b3f3003b5e4c818f83a4e38d71 Mon Sep 17 00:00:00 2001 From: Aysam Guerler Date: Thu, 19 Jun 2014 07:56:03 -0400 Subject: [PATCH] Charts: Simplify canvas id parsing --- config/plugins/visualizations/charts/static/app.css | 1 + config/plugins/visualizations/charts/static/build-app.js | 2 +- .../charts/static/charts/jqplot/bar/wrapper.js | 3 ++- .../charts/static/charts/jqplot/boxplot/wrapper.js | 3 ++- .../charts/static/charts/nvd3/bar/wrapper.js | 5 +++-- .../charts/static/charts/nvd3/bar_horizontal/wrapper.js | 5 +++-- .../static/charts/nvd3/bar_horizontal_stacked/wrapper.js | 5 +++-- .../charts/static/charts/nvd3/bar_stacked/wrapper.js | 5 +++-- .../charts/static/charts/nvd3/histogram/wrapper.js | 5 +++-- .../static/charts/nvd3/histogram_discrete/wrapper.js | 5 +++-- .../charts/static/charts/nvd3/line/wrapper.js | 5 +++-- .../charts/static/charts/nvd3/line_focus/wrapper.js | 5 +++-- .../charts/static/charts/nvd3/pie/wrapper.js | 4 ++-- .../charts/static/charts/nvd3/scatter/wrapper.js | 5 +++-- .../charts/static/charts/nvd3/stackedarea/wrapper.js | 5 +++-- .../charts/static/charts/nvd3/stackedarea_full/wrapper.js | 5 +++-- .../static/charts/nvd3/stackedarea_stream/wrapper.js | 5 +++-- .../charts/static/charts/others/heatmap/wrapper.js | 4 ++-- .../charts/static/charts/others/heatmap_cluster/wrapper.js | 4 ++-- .../visualizations/charts/static/library/ui-table-form.js | 7 +------ .../plugins/visualizations/charts/static/views/settings.js | 4 ++-- .../plugins/visualizations/charts/static/views/viewport.js | 6 +++--- 22 files changed, 54 insertions(+), 44 deletions(-) diff --git a/config/plugins/visualizations/charts/static/app.css b/config/plugins/visualizations/charts/static/app.css index fb43b925060..9eda283735b 100644 --- a/config/plugins/visualizations/charts/static/app.css +++ b/config/plugins/visualizations/charts/static/app.css @@ -34,6 +34,7 @@ .charts-grid .image { padding: 10px; width: 100px; + height: 86px; } .charts-grid .title { diff --git a/config/plugins/visualizations/charts/static/build-app.js b/config/plugins/visualizations/charts/static/build-app.js index 1c3ca153f64..1facf0cb663 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'