Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  feat(privacy): Remove GA from docs page
  fix(babel): fix decorator error with new version of babel
  fix(mixins): Add condition to check if chart instance is present.
  chore(release): Add dist files
  chore(release): 3.3.1
  fix(release): Add exports to index
  • Loading branch information
apertureless committed May 25, 2018
2 parents 54bb73e + d2d944f commit 85a99e8
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
]
}
}],
"@babel/stage-2"
["@babel/stage-2",{"decoratorsLegacy":true}]
],
"comments": false
}
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

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.1"></a>
## [3.3.1](https://github.com/apertureless/vue-chartjs/compare/v3.3.0...v3.3.1) (2018-03-26)


### Bug Fixes

* **release:** Add exports to index ([8341f94](https://github.com/apertureless/vue-chartjs/commit/8341f94))



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

Expand Down
6 changes: 4 additions & 2 deletions 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.

13 changes: 0 additions & 13 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,5 @@
<script src="https://unpkg.com/docute/plugins/docsearch.js"></script>
<script src="./config.js"></script>
<!-- don't remove this part end -->

<!-- Google Analytics -->
<script>
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
ga('create', 'UA-92766713-1', 'auto');
ga('send', 'pageview');
docute.router.afterEach(function (to) {
ga('set', 'page', to.fullPath);
ga('send', 'pageview');
});
</script>
<script async src='https://www.google-analytics.com/analytics.js'></script>
<!-- End Google Analytics -->
</body>
</html>
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.0",
"version": "3.3.1",
"description": "Vue.js wrapper for chart.js for creating beautiful charts.",
"author": "Jakub Juszczak <[email protected]>",
"homepage": "http://vue-chartjs.org",
Expand Down
9 changes: 6 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import {
PolarArea,
Radar,
Bubble,
Scatter
Scatter,
generateChart
} from './BaseCharts'

const VueCharts = {
Expand All @@ -22,7 +23,8 @@ const VueCharts = {
Radar,
Bubble,
Scatter,
mixins
mixins,
generateChart
}

export default VueCharts
Expand All @@ -38,5 +40,6 @@ export {
Radar,
Bubble,
Scatter,
mixins
mixins,
generateChart
}
4 changes: 3 additions & 1 deletion src/mixins/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ function dataHandler (newData, oldData) {
}
chart.update()
} else {
chart.destroy()
if (chart) {
chart.destroy()
}
this.renderChart(this.chartData, this.options)
}
} else {
Expand Down

0 comments on commit 85a99e8

Please sign in to comment.