Skip to content

Commit b998cdd

Browse files
committed
Merge branch 'master' into develop
* master: docs: Fix missing comma in props (#448) docs: Update README.md (#447) docs: Fix typo (#440) Create CNAME chore(docs): Add missing commas in example snippet (#423) chore(documentation): Fix docute version requested from unpkg (Last compatible v3.4.12) (#418) chore(docs): Change CNAME to trigger https chore(docs): Change CNAME to trigger https Update and refine Indonesian translation Revert "wip: Refactor mixin in seperate functions" wip: Refactor mixin in seperate functions fix(reactive-mixins): Add prop type and default value
2 parents 6dcd213 + d38f9ad commit b998cdd

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

docs/CNAME

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vue-chartjs.org

docs/guide/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export default {
8989
```
9090

9191
::: danger Template Tag can not be merged
92-
Do not include the `<template>` tag to your `.vue` files. Vue can **not** merge templates. If you add an empty `<template>` tag, Vue will took the template from your component and not from the extended one, which will result in an empty template and errors.
92+
Do not include the `<template>` tag to your `.vue` files. Vue can **not** merge templates. If you add an empty `<template>` tag, Vue will take the template from your component and not from the extended one, which will result in an empty template and errors.
9393
:::
9494

9595
## Updating Charts
@@ -273,7 +273,7 @@ export default {
273273
chartdata: {
274274
type: Object,
275275
default: null
276-
}
276+
},
277277
options: {
278278
type: Object,
279279
default: null

src/mixins/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ export const reactiveData = {
8787
export const reactiveProp = {
8888
props: {
8989
chartData: {
90-
required: true
90+
type: Object,
91+
required: true,
92+
default: () => {}
9193
}
9294
},
9395
watch: {

0 commit comments

Comments
 (0)