Merge pull request apertureless#291 from apertureless/feature/fix_rea…

…ctive_mixins fix(mixins): Check for chartjs instance before rendering chart
syshex · Jan 12, 2018 · 3b46bc8 · 3b46bc8
2 parents 0506b4e + 39ff839
commit 3b46bc8
Show file tree

Hide file tree

Showing 3 changed files with 552 additions and 484 deletions.
diff --git a/src/mixins/reactiveData.js b/src/mixins/reactiveData.js
@@ -63,6 +63,9 @@ module.exports = {
             this.renderChart(this.chartData, this.options)
           }
         } else {
+          if (this.$data._chart) {
+            this.$data._chart.destroy()
+          }
           this.renderChart(this.chartData, this.options)
         }
       }

diff --git a/src/mixins/reactiveProp.js b/src/mixins/reactiveProp.js
@@ -63,6 +63,9 @@ module.exports = {
             this.renderChart(this.chartData, this.options)
           }
         } else {
+          if (this.$data._chart) {
+            this.$data._chart.destroy()
+          }
           this.renderChart(this.chartData, this.options)
         }
       }