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 #443 from tobiasviehweger/master

Browse Source 
Allow blank values if 'options.allowBlank' is set
This commit is contained in:
Valeriy 2016-04-26 22:00:49 +05:00
commit 5da3d3df15
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jquery.datetimepicker.js
View File

@ -1278,8 +1278,20 @@
return !isNaN(d.getTime());
};
_this.setCurrentTime = function (dTime) {
_this.currentTime = (typeof dTime === 'string') ? _this.strToDateTime(dTime) : _this.isValidDate(dTime) ? dTime : _this.now();
_this.setCurrentTime = function (dTime, requireValidDate) {
if (typeof dTime === 'string') {
_this.currentTime = _this.strToDateTime(dTime);
}
else if (_this.isValidDate(dTime)) {
_this.currentTime = dTime;
}
else if (!dTime && !requireValidDate && options.allowBlank) {
_this.currentTime = null;
}
else {
_this.currentTime = _this.now();
}
datetimepicker.trigger('xchange.xdsoft');
};
@ -1529,6 +1541,10 @@
xchangeTimer = setTimeout(function () {
if (_xdsoft_datetime.currentTime === undefined || _xdsoft_datetime.currentTime === null) {
//In case blanks are allowed, delay construction until we have a valid date
if (options.allowBlank)
return;
_xdsoft_datetime.currentTime = _xdsoft_datetime.now();
}
@ -2254,7 +2270,7 @@
}
triggerAfterOpen = true;
_xdsoft_datetime.setCurrentTime(getCurrentValue());
_xdsoft_datetime.setCurrentTime(getCurrentValue(), true);
if(options.mask) {
setMask(options);
}