mirror of
https://github.com/xdan/datetimepicker.git
synced 2024-11-18 06:24:22 +00:00
Support for Moment.js formats
When using Moment.js to format dates, the syntax is not the same as the default one : http://momentjs.com/docs/#/parsing/string-format/ So, parsing something like "DD/MM/YYYY HH:mm" to build the mask ends with a wrong mask that fails when testing with "isValidValue" function, resulting in replacing the value of the input field with the wrong mask that was built just before.
This commit is contained in:
parent
bd4f97e128
commit
5d5fb81a3e
@ -1203,14 +1203,25 @@
|
||||
input.off('keydown.xdsoft');
|
||||
|
||||
if (options.mask === true) {
|
||||
options.mask = options.format
|
||||
.replace(/Y/g, '9999')
|
||||
.replace(/F/g, '9999')
|
||||
.replace(/m/g, '19')
|
||||
.replace(/d/g, '39')
|
||||
.replace(/H/g, '29')
|
||||
.replace(/i/g, '59')
|
||||
.replace(/s/g, '59');
|
||||
if (typeof moment != 'undefined') {
|
||||
options.mask = options.format
|
||||
.replace(/Y{4}/g, '9999')
|
||||
.replace(/Y{2}/g, '99')
|
||||
.replace(/M{2}/g, '19')
|
||||
.replace(/D{2}/g, '39')
|
||||
.replace(/H{2}/g, '29')
|
||||
.replace(/m{2}/g, '59')
|
||||
.replace(/s{2}/g, '59');
|
||||
} else {
|
||||
options.mask = options.format
|
||||
.replace(/Y/g, '9999')
|
||||
.replace(/F/g, '9999')
|
||||
.replace(/m/g, '19')
|
||||
.replace(/d/g, '39')
|
||||
.replace(/H/g, '29')
|
||||
.replace(/i/g, '59')
|
||||
.replace(/s/g, '59');
|
||||
}
|
||||
}
|
||||
|
||||
if ($.type(options.mask) === 'string') {
|
||||
|
Loading…
Reference in New Issue
Block a user