Fix setup crash when not specifying locale.

PhantomxJoker · Feb 28, 2018 · 4f75136 · 4f75136
1 parent 11fa0fd
commit 4f75136
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v0.7.1
+## Bug Fixes
+* Fix setup crash when not manually specifying a locale
+
 # v0.7.0
 ## Bug Fixes
 `v-calendar`

diff --git a/docs/docs.js b/docs/docs.js
@@ -13,7 +13,7 @@ Vue.use(VueClipboard);
 Vue.use(Buefy, {
   defaultIconPack: 'fa',
 });
-Vue.use(VCalendar, { locale: 'us', firstDayOfWeek: 1 });
+Vue.use(VCalendar);
 Vue.component('CodeBlock', CodeBlock);
 Vue.directive('highlight', {
   deep: true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "v-calendar",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "A clean and extendable plugin for building simple attributed calendars in Vue.js.",
   "keywords": [
     "vue",

diff --git a/src/utils/defaults.js b/src/utils/defaults.js
@@ -131,8 +131,7 @@ export const resolveDefault = (def, args) => (isObject(def) && def) || (isFuncti
 
 export const mergeDefaults = (otherDefaults) => {
   // Setup locale defaults if needed
-  const newLocale = otherDefaults && otherDefaults.locale;
-  if (newLocale && newLocale !== defaults.locale) setupLocale(newLocale, defaults);
+  setupLocale(otherDefaults && otherDefaults.locale, defaults);
   // Assign the defaults
   return Object.assign(defaults, otherDefaults);
 };