From da1af040a2b42e82a79427db906861ce609035d5 Mon Sep 17 00:00:00 2001 From: dominic-lehle Date: Mon, 12 Oct 2015 11:09:17 +0200 Subject: [PATCH 1/2] added general redraw option --- addon/chart-data-updater.js | 2 +- addon/components/ember-chart.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addon/chart-data-updater.js b/addon/chart-data-updater.js index 0922993..0cda367 100644 --- a/addon/chart-data-updater.js +++ b/addon/chart-data-updater.js @@ -75,4 +75,4 @@ export default Ember.Object.extend({ return this.get('redraw'); } -}); +}); \ No newline at end of file diff --git a/addon/components/ember-chart.js b/addon/components/ember-chart.js index 3a3be7b..d887f4b 100644 --- a/addon/components/ember-chart.js +++ b/addon/components/ember-chart.js @@ -11,7 +11,7 @@ export default Ember.Component.extend({ var data = this.get('data'); var type = Ember.String.classify(this.get('type')); var options = Ember.merge({}, this.get('options')); - + var redraw = this.get('redraw'); var chart = new Chart(context)[type](data, options); if (this.get('legend')) { @@ -19,7 +19,7 @@ export default Ember.Component.extend({ this.$().wrap("
"); this.$().parent().append(legend); } - + this.set('redraw', redraw); this.set('chart', chart); this.addObserver('data', this, this.updateChart); this.addObserver('data.[]', this, this.updateChart); @@ -45,7 +45,7 @@ export default Ember.Component.extend({ chart: chart }).updateByType(); - if (redraw) { + if (this.get('redraw') || redraw) { this.willDestroyElement(); this.didInsertElement(); } else { From e2dcfd97c3900c1aef98b16f80d09ea0e57069e4 Mon Sep 17 00:00:00 2001 From: dominic-lehle Date: Thu, 11 Feb 2016 10:05:24 +0100 Subject: [PATCH 2/2] added newline --- addon/chart-data-updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/chart-data-updater.js b/addon/chart-data-updater.js index 0cda367..0922993 100644 --- a/addon/chart-data-updater.js +++ b/addon/chart-data-updater.js @@ -75,4 +75,4 @@ export default Ember.Object.extend({ return this.get('redraw'); } -}); \ No newline at end of file +});