From a45188afbb0981517a80cb83b0967b0c47f409b3 Mon Sep 17 00:00:00 2001 From: Lionel Bijaoui Date: Wed, 31 Aug 2016 18:24:32 +0200 Subject: [PATCH] :bug: bug: "Invalid date" message in pikaday field. Change dev schema for a simple one. Delete default in pikaday field --- dev/schema.js | 44 +++++++++++++++++-------------------- src/fields/fieldPikaday.vue | 33 ---------------------------- 2 files changed, 20 insertions(+), 57 deletions(-) diff --git a/dev/schema.js b/dev/schema.js index c4207fd8..3602fb6a 100644 --- a/dev/schema.js +++ b/dev/schema.js @@ -303,48 +303,44 @@ module.exports = { model: "dob", required: true, placeholder: "User's birth of date", - min: moment("1900-01-01").toDate(), - max: moment("2016-01-01").toDate(), - validator: [ - validators.date - ], + validator: validators.date, pikadayOptions: { - bound: true, - position: 'bottom left', - reposition: true, + // bound: true, + // position: 'bottom left', + // reposition: true, // container: , - format: 'YYYY-MM-DD HH:mm:ss', + // format: 'YYYY-MM-DD HH:mm:ss', // formatStrict: , // defaultDate: , // setDefaultDate: , - firstDay: 1, + // firstDay: 1, // minDate: , // maxDate: , - disableWeekends: false, + // disableWeekends: false, // disableDayFn: , // yearRange: , - showWeekNumber: false, - isRTL: false, - i18n: { - previousMonth : 'Previous Month', - nextMonth : 'Next Month', - months : ['January','February','March','April','May','June','July','August','September','October','November','December'], - weekdays : ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'], - weekdaysShort : ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'] - }, + // showWeekNumber: false, + // isRTL: false, + // i18n: { + // previousMonth : 'Previous Month', + // nextMonth : 'Next Month', + // months : ['January','February','March','April','May','June','July','August','September','October','November','December'], + // weekdays : ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'], + // weekdaysShort : ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'] + // }, // yearSuffix: , - showMonthAfterYear: false, - showDaysInNextAndPreviousMonths: false, + // showMonthAfterYear: false, + // showDaysInNextAndPreviousMonths: false, // numberOfMonths: , // mainCalendar: , - theme: null, + // theme: null, // onSelect: , // onOpen: , // onClose: , // onDraw: , }, onChanged(model, newVal, oldVal, field) { - model.age = moment().year() - moment(newVal).year(); + // model.age = moment().year() - moment(newVal).year(); } },{ diff --git a/src/fields/fieldPikaday.vue b/src/fields/fieldPikaday.vue index d1154594..9ec7ce7d 100644 --- a/src/fields/fieldPikaday.vue +++ b/src/fields/fieldPikaday.vue @@ -49,39 +49,6 @@ this.picker = new window.Pikaday(defaults(this.schema.pikadayOptions || {}, { field: this.$el, // bind the datepicker to a form field // trigger: , // use a different element to trigger opening the datepicker, see [trigger example][] (default to `field`) - bound: true, // automatically show/hide the datepicker on `field` focus (default `true` if `field` is set) - position: "bottom left", // preferred position of the datepicker relative to the form field, e.g.: `top right`, `bottom right` **Note:** automatic adjustment may occur to avoid datepicker from being displayed outside the viewport, see [positions example][] (default to "bottom left") - reposition: true, // can be set to false to not reposition datepicker within the viewport, forcing it to take the configured `position` (default: true) - // container: , // DOM node to render calendar into, see [container example][] (default: undefined) - format: inputFormat, // the default output format for `.toString()` and `field` value (requires [Moment.js][moment] for custom formatting) - // formatStrict: , // the default flag for moment"s strict date parsing (requires [Moment.js][moment] for custom formatting) - // defaultDate: , // the initial date to view when first opened - // setDefaultDate: , // make the `defaultDate` the initial selected value - firstDay: 1, // first day of the week (0: Sunday, 1: Monday, etc) - // minDate: , // the minimum/earliest date that can be selected (this should be a native Date object - e.g. `new Date()` or `moment().toDate()`) - // maxDate: , // the maximum/latest date that can be selected (this should be a native Date object - e.g. `new Date()` or `moment().toDate()`) - disableWeekends: false, // disallow selection of Saturdays or Sundays - // disableDayFn: , // callback function that gets passed a Date object for each day in view. Should return true to disable selection of that day. - // yearRange: , // number of years either side (e.g. `10`) or array of upper/lower range (e.g. `[1900,2015]`) - showWeekNumber: false, // show the ISO week number at the head of the row (default `false`) - isRTL: false, // reverse the calendar for right-to-left languages - i18n: { - previousMonth : "Previous Month", - nextMonth : "Next Month", - months : ["January","February","March","April","May","June","July","August","September","October","November","December"], - weekdays : ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"], - weekdaysShort : ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"] - }, // language defaults for month and weekday names (see internationalization below) - // yearSuffix: , // additional text to append to the year in the title - showMonthAfterYear: false, // render the month after year in the title (default `false`) - showDaysInNextAndPreviousMonths: false, // render days of the calendar grid that fall in the next or previous months to the current month instead of rendering an empty table cell (default: false) - // numberOfMonths: , // number of visible calendars - // mainCalendar: , // when `numberOfMonths` is used, this will help you to choose where the main calendar will be (default `left`, can be set to `right`). Only used for the first display or when a selected date is not already visible - theme: null, // define a classname that can be used as a hook for styling different themes, see [theme example][] (default `null`) - // onSelect: , // callback function for when a date is selected - // onOpen: , // callback function for when the picker becomes visible - // onClose: , // callback function for when the picker is hidden - // onDraw: , // callback function for when the picker draws a new month })); } else{