library-mirrors/datetimepicker
1
0
Fork 0
mirror of https://github.com/xdan/datetimepicker.git synced 2024-11-18 06:24:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #398 from Maze-fr/master

Browse Source 
Support for Moment.js formats
This commit is contained in:
Valeriy 2016-02-25 18:34:59 +05:00
commit 1c08e89353
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jquery.datetimepicker.js
View File

@ -1203,6 +1203,16 @@
input.off('keydown.xdsoft'); input.off('keydown.xdsoft');
if (options.mask === true) { if (options.mask === true) {
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 options.mask = options.format
.replace(/Y/g, '9999') .replace(/Y/g, '9999')
.replace(/F/g, '9999') .replace(/F/g, '9999')
@ -1212,6 +1222,7 @@
.replace(/i/g, '59') .replace(/i/g, '59')
.replace(/s/g, '59'); .replace(/s/g, '59');
} }
}
if ($.type(options.mask) === 'string') { if ($.type(options.mask) === 'string') {
if (!isValidValue(options.mask, input.val())) { if (!isValidValue(options.mask, input.val())) {