dayspan-vuetify
Advanced tools
Comparing version 0.3.2 to 0.3.3
{ | ||
"name": "dayspan-vuetify", | ||
"version": "0.3.2", | ||
"version": "0.3.3", | ||
"description": "A collection of components for Schedules and Calendars in DaySpan using Vuetify", | ||
@@ -28,3 +28,4 @@ "author": "Philip Diffenderfer <pdiffenderfer@gmail.com>", | ||
"vue": "^2.3.3", | ||
"vuetify": "^1.1.1" | ||
"vuetify": "^1.1.1", | ||
"moment": "2.7.0" | ||
}, | ||
@@ -31,0 +32,0 @@ "devDependencies": { |
@@ -166,3 +166,3 @@ | ||
dsMergeLocale(locale, update); | ||
dsMergeLocale(locale, update, '', true); | ||
}, | ||
@@ -606,7 +606,7 @@ | ||
refreshTimes() | ||
refreshTimes(force = false) | ||
{ | ||
let today = Day.today(); | ||
if (!today.sameDay( this.today )) | ||
if (!today.sameDay( this.today ) || force) | ||
{ | ||
@@ -613,0 +613,0 @@ this.today = today; |
@@ -8,5 +8,11 @@ import Vue from 'vue' | ||
import 'material-design-icons-iconfont/dist/material-design-icons.css' | ||
import './styles/app.scss' | ||
import fr from './locales/fr' | ||
import en from './locales/en' | ||
import 'moment/lang/fr' | ||
import * as moment from 'moment' | ||
moment.lang('en') | ||
Vue.config.productionTip = false | ||
@@ -18,2 +24,6 @@ | ||
{ | ||
data: | ||
{ | ||
locales: { en, fr } | ||
}, | ||
methods: | ||
@@ -20,0 +30,0 @@ { |
@@ -105,3 +105,3 @@ | ||
export function dsMergeLocale(currentData, localeData, path = '') | ||
export function dsMergeLocale(currentData, localeData, path = '', strict = false) | ||
{ | ||
@@ -146,3 +146,6 @@ if (fn.isArray(localeData) && fn.isArray(currentData) && localeData.length === currentData.length) | ||
throw 'Incompatible locale data at ' + path; | ||
if (strict) | ||
{ | ||
throw 'Incompatible locale data at ' + path; | ||
} | ||
} |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
1831570
93
3390
5
+ Addedmoment@2.7.0
+ Addedmoment@2.7.0(transitive)