💎 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/

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [v1.1.3](https://github.com/apertureless/vue-chartjs/tree/v1.1.3) (2016-09-08)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.1.2...v1.1.3)
+
+**Implemented enhancements:**
+
+- Add test [\#1](https://github.com/apertureless/vue-chartjs/issues/1)
+
+**Fixed bugs:**
+
+- Passing chart size \(width / height\) as prop doesnt resize the chart [\#8](https://github.com/apertureless/vue-chartjs/issues/8)
+
+**Merged pull requests:**
+
+- Added bubble chart type [\#9](https://github.com/apertureless/vue-chartjs/pull/9) ([jcalonso](https://github.com/jcalonso))
+
 ## [1.1.2](https://github.com/apertureless/vue-chartjs/tree/1.1.2) (2016-09-07)
 [Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.1.1...1.1.2)
 

README.md

@@ -6,7 +6,7 @@
 
 ## Install
 
-Simply run `npm install vue-chartjs`
+Simply run `npm install vue-chartjs@1.1.3`
 
 ## How to use
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-chartjs",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "Vue wrapper for chart.js",
   "author": "Jakub Juszczak <jakub@nextindex.de>",
   "repository": {
@@ -15,6 +15,9 @@
     "Charts"
   ],
   "main": "dist/vue-chartjs.js",
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "dev": "node build/dev-server.js",
     "build": "node build/build.js",
@@ -26,7 +29,7 @@
   },
   "dependencies": {
     "babel-runtime": "^6.0.0",
-    "chart.js": "^2.1.6",
+    "chart.js": "^2.6.0",
     "vue": "^1.0.21"
   },
   "devDependencies": {

src/BaseCharts/Bar.js

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

src/BaseCharts/Bubble.js

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

src/BaseCharts/Doughnut.js

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

src/BaseCharts/Line.js

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

src/BaseCharts/Pie.js

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

src/BaseCharts/PolarArea.js

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

src/BaseCharts/Radar.js

@@ -46,6 +46,8 @@ export default Vue.extend({
     }
   },
   beforeDestroy () {
-    this._chart.destroy()
+    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