Compare commits

...

12 Commits

Author SHA1 Message Date
Jakub Juszczak
9237fa538f 💎 Release new version 2.8.2
Signed-off-by: Jakub Juszczak <netghost03@gmail.com>
2017-08-12 20:13:04 +02:00
Jakub
82c502cf45 Merge pull request #166 from dsbert/patch-1
Add support for xLabels and yLabels
2017-08-09 14:17:48 +02:00
bertolds
676a60a363 fix linting errors 2017-08-07 09:49:46 -04:00
bertolds
f60f87c141 Merge branch 'develop' into patch-1 2017-08-07 09:46:37 -04:00
bertolds
b7f2bf7db2 Merge branch 'patch-1' of https://github.com/dsbert/vue-chartjs into patch-1 2017-08-07 09:46:03 -04:00
bertolds
0e419886b1 Add cross-env to all steps of build script 2017-08-07 09:42:16 -04:00
Dan
f95ea49a19 Merge pull request #1 from apertureless/develop
Bring up to date with origin
2017-08-07 09:41:47 -04:00
Dan
1e392091ea Add support for xLabels and yLabels 2017-08-07 09:41:33 -04:00
Jakub
4bf4f5736c Merge pull request #165 from mikeybeck/patch-1
Update README.md
2017-08-07 10:24:38 +02:00
Mikey Beck
703a91dafa Update README.md 2017-08-07 12:07:18 +12:00
Mikey Beck
d68af61dce Update README.md
Typo
2017-08-07 12:05:01 +12:00
Dan
a5b58c3b98 Add support for xLabels and yLabels 2017-08-04 15:06:22 -04:00
4 changed files with 20 additions and 4 deletions

View File

@@ -66,7 +66,7 @@ You can use `vue-chartjs` directly in the browser without any build setup. Like
If you're using Gulp, Browserify or Webpack 1 the entry is `vue-chartjs.js` which is __transpiled__ and __bundled__ UMD Module.
However Vue.js and Chart.js are `deerDependencies` so you have to install them seperately. In most projects you will have `Vue.js` already installed anyways. This way, you can have different versions of Vue.js and Chart.js then in this package.
However Vue.js and Chart.js are `peerDependencies` so you have to install them separately. In most projects you will have `Vue.js` already installed anyways. This way, you can have different versions of Vue.js and Chart.js then in this package.
### Webpack 2
If you're using Webpack 2 it will automatically use the `jsnext:main` / `module` entry point. Which is `es/index.js`

View File

@@ -1,6 +1,6 @@
{
"name": "vue-chartjs",
"version": "2.8.1",
"version": "2.8.2",
"description": "vue.js wrapper for chart.js",
"author": "Jakub Juszczak <jakub@posteo.de>",
"homepage": "http://vue-chartjs.org",

View File

@@ -48,7 +48,15 @@ module.exports = {
}
})
chart.data.labels = newData.labels
if (newData.hasOwnProperty('labels')) {
chart.data.labels = newData.labels
}
if (newData.hasOwnProperty('xLabels')) {
chart.data.xLabels = newData.xLabels
}
if (newData.hasOwnProperty('yLabels')) {
chart.data.yLabels = newData.yLabels
}
chart.update()
} else {
chart.destroy()

View File

@@ -48,7 +48,15 @@ module.exports = {
}
})
chart.data.labels = newData.labels
if (newData.hasOwnProperty('labels')) {
chart.data.labels = newData.labels
}
if (newData.hasOwnProperty('xLabels')) {
chart.data.xLabels = newData.xLabels
}
if (newData.hasOwnProperty('yLabels')) {
chart.data.yLabels = newData.yLabels
}
chart.update()
} else {
chart.destroy()