Merge branch 'develop' of github.com:apertureless/vue-chartjs into de…

…velop * 'develop' of github.com:apertureless/vue-chartjs: Fix beforeDestory when renderChart was not called
syshex · Jul 4, 2017 · b23ce23 · b23ce23
2 parents 7f62914 + 677c53d
commit b23ce23
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 9 deletions.
diff --git a/src/BaseCharts/Bar.js b/src/BaseCharts/Bar.js
@@ -79,6 +79,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })
diff --git a/src/BaseCharts/Bubble.js b/src/BaseCharts/Bubble.js
@@ -80,6 +80,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })
diff --git a/src/BaseCharts/Doughnut.js b/src/BaseCharts/Doughnut.js
@@ -63,6 +63,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })
diff --git a/src/BaseCharts/HorizontalBar.js b/src/BaseCharts/HorizontalBar.js
@@ -79,6 +79,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })
diff --git a/src/BaseCharts/Line.js b/src/BaseCharts/Line.js
@@ -78,6 +78,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })
diff --git a/src/BaseCharts/Pie.js b/src/BaseCharts/Pie.js
@@ -63,6 +63,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })
diff --git a/src/BaseCharts/PolarArea.js b/src/BaseCharts/PolarArea.js
@@ -63,6 +63,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })
diff --git a/src/BaseCharts/Radar.js b/src/BaseCharts/Radar.js
@@ -63,6 +63,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })
diff --git a/src/BaseCharts/Scatter.js b/src/BaseCharts/Scatter.js
@@ -69,6 +69,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    if (this._chart) {
+      this._chart.destroy()
+    }
   }
 })