💎 Release new version 1.2.0

* release/1.x:
  ⬆️ Update dependency chart.js to 2.6.0
  🐛 Fix dependency
  💎 Release new version 1.1.4

# Conflicts:
#	dist/vue-chartjs.js
#	dist/vue-chartjs.js.map

.gitignore

@@ -4,3 +4,5 @@ npm-debug.log
 selenium-debug.log
 test/unit/coverage
 test/e2e/reports
+dist/
+es/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-chartjs",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "Vue wrapper for chart.js",
   "author": "Jakub Juszczak <jakub@nextindex.de>",
   "repository": {
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "babel-runtime": "^6.0.0",
-    "chart.js": "^2.5.0",
+    "chart.js": "^2.6.0",
     "vue": "^1.0.21"
   },
   "devDependencies": {

src/BaseCharts/Bar.js

@@ -63,6 +63,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
+    if (this._chart) {
       this._chart.destroy()
     }
+  }
 })

src/BaseCharts/Bubble.js

@@ -46,6 +46,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
+    if (this._chart) {
       this._chart.destroy()
     }
+  }
 })

src/BaseCharts/Doughnut.js

@@ -46,6 +46,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
+    if (this._chart) {
       this._chart.destroy()
     }
+  }
 })

src/BaseCharts/Line.js

@@ -61,6 +61,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
+    if (this._chart) {
       this._chart.destroy()
     }
+  }
 })

src/BaseCharts/Pie.js

@@ -46,6 +46,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
+    if (this._chart) {
       this._chart.destroy()
     }
+  }
 })

src/BaseCharts/PolarArea.js

@@ -46,6 +46,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
+    if (this._chart) {
       this._chart.destroy()
     }
+  }
 })

src/BaseCharts/Radar.js

@@ -46,6 +46,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
+    if (this._chart) {
       this._chart.destroy()
     }
+  }
 })

src/BaseCharts/Scatter.js

@@ -0,0 +1,59 @@
+import Vue from 'vue'
+import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
+
+export default Vue.extend({
+  template: `
+    <div>
+      <canvas id="{{chartId}}" width={{width}} height={{height}} v-el:canvas></canvas>
+    </div>
+  `,
+
+  props: {
+    chartId: {
+      default: 'scatter-chart',
+      type: String
+    },
+    width: {
+      default: 400,
+      type: Number
+    },
+    height: {
+      default: 400,
+      type: Number
+    }
+  },
+
+  data () {
+    return {
+      defaultOptions: {
+        scales: {
+          xAxes: [{
+            type: 'linear',
+            position: 'bottom'
+          }]
+        }
+      }
+    }
+  },
+
+  methods: {
+    render (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
+      this._chart = new Chart(
+        this.$els.canvas.getContext('2d'), {
+          type: 'scatter',
+          data: data,
+          options: chartOptions
+        }
+      )
+      this._chart.generateLegend()
+    }
+  },
+  beforeDestroy () {
+    if (this._chart) {
+      this._chart.destroy()
+    }
+  }
+})

src/index.js

@@ -5,6 +5,7 @@ import Pie from './BaseCharts/Pie'
 import PolarArea from './BaseCharts/PolarArea'
 import Radar from './BaseCharts/Radar'
 import Bubble from './BaseCharts/Bubble'
+import Scatter from './BaseCharts/Scatter'
 
 const VueCharts = {
   Bar,
@@ -13,7 +14,8 @@ const VueCharts = {
   Pie,
   PolarArea,
   Radar,
-  Bubble
+  Bubble,
+  Scatter
 }
 
 module.exports = VueCharts

yarn.lock

@@ -1072,11 +1072,11 @@ change-case@3.0.x:
     upper-case "^1.1.1"
     upper-case-first "^1.1.0"
 
-chart.js@^2.5.0:
+chart.js@^2.6.0:
-  version "2.5.0"
+  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.5.0.tgz#fe6e751a893769f56e72bee5ad91207e1c592957"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.6.0.tgz#308f9a4b0bfed5a154c14f5deb1d9470d22abe71"
   dependencies:
-    chartjs-color "^2.0.0"
+    chartjs-color "^2.1.0"
     moment "^2.10.6"
 
 chartjs-color-string@^0.4.0:
@@ -1085,7 +1085,7 @@ chartjs-color-string@^0.4.0:
   dependencies:
     color-name "^1.0.0"
 
-chartjs-color@^2.0.0:
+chartjs-color@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.1.0.tgz#9c39ac830ccd98996ae80c9f11086ff12c98a756"
   dependencies: