Merge branch 'master' into develop

* master: docs: Fix missing comma in props (apertureless#448) docs: Update README.md (apertureless#447) docs: Fix typo (apertureless#440) Create CNAME chore(docs): Add missing commas in example snippet (apertureless#423) chore(documentation): Fix docute version requested from unpkg (Last compatible v3.4.12) (apertureless#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
syshex · Nov 27, 2018 · b998cdd · b998cdd
2 parents 6dcd213 + d38f9ad
commit b998cdd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/docs/CNAME b/docs/CNAME
@@ -0,0 +1 @@
+vue-chartjs.org
diff --git a/docs/guide/README.md b/docs/guide/README.md
@@ -89,7 +89,7 @@ export default {
 ```
 
 ::: danger Template Tag can not be merged
-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.
+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.
 :::
 
 ## Updating Charts
@@ -273,7 +273,7 @@ export default {
     chartdata: {
       type: Object,
       default: null
-    }
+    },
     options: {
       type: Object,
       default: null

diff --git a/src/mixins/index.js b/src/mixins/index.js
@@ -87,7 +87,9 @@ export const reactiveData = {
 export const reactiveProp = {
   props: {
     chartData: {
-      required: true
+      type: Object,
+      required: true,
+      default: () => {}
     }
   },
   watch: {