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

Fix issue #641

Browse Source 
This removes the reference to the global moment function. A custom masking function must now accompany any custom formatter configured via setDateFormatter. This will prevent moment.js from breaking pages that use the default formatter.
This commit is contained in:
Niren Orie 2018-02-09 18:26:55 -04:00
parent 892e2b8807
commit f006e96b62
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jquery.datetimepicker.js
View File

@ -2249,15 +2249,8 @@ var datetimepickerFactory = function ($) {
}
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');
if (dateHelper.formatMask) {
options.mask = dateHelper.formatMask(options.format)
} else {
options.mask = options.format
.replace(/Y/g, '9999')