Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  chore: add dist files
  chore(release): 3.3.2
  fix(core): Delete old chart.js instance first (apertureless#375)
  • Loading branch information
apertureless committed Jun 18, 2018
2 parents cf6ac41 + 1ff47e5 commit ffa2d21
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 5 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

<a name="3.3.2"></a>
## [3.3.2](https://github.com/apertureless/vue-chartjs/compare/v3.3.1...v3.3.2) (2018-06-18)


### Bug Fixes

* **babel:** fix decorator error with new version of babel ([2fe804b](https://github.com/apertureless/vue-chartjs/commit/2fe804b))
* **core:** Delete old chart.js instance first ([#375](https://github.com/apertureless/vue-chartjs/issues/375)) ([89a7cac](https://github.com/apertureless/vue-chartjs/commit/89a7cac))
* **mixins:** Add condition to check if chart instance is present. ([1fed8e7](https://github.com/apertureless/vue-chartjs/commit/1fed8e7))


### Features

* **privacy:** Remove GA from docs page ([d2d944f](https://github.com/apertureless/vue-chartjs/commit/d2d944f))



<a name="3.3.1"></a>
## [3.3.1](https://github.com/apertureless/vue-chartjs/compare/v3.3.0...v3.3.1) (2018-03-26)

Expand Down
6 changes: 5 additions & 1 deletion dist/vue-chartjs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/vue-chartjs.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-chartjs.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/vue-chartjs.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-chartjs",
"version": "3.3.1",
"version": "3.3.2",
"description": "Vue.js wrapper for chart.js for creating beautiful charts.",
"author": "Jakub Juszczak <[email protected]>",
"homepage": "http://vue-chartjs.org",
Expand Down
1 change: 1 addition & 0 deletions src/BaseCharts.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export function generateChart (chartId, chartType) {
this.$data._plugins.push(plugin)
},
renderChart (data, options) {
if (this.$data._chart) this.$data._chart.destroy()
this.$data._chart = new Chart(
this.$refs.canvas.getContext('2d'), {
type: chartType,
Expand Down

0 comments on commit ffa2d21

Please sign in to comment.