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 #464 from andrewmnlv/master

Browse Source 
fix: currentTime can't be null for inline mode
This commit is contained in:
Valeriy 2017-05-12 10:04:18 +05:00 committed by GitHub
commit 1525c13027
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jquery.datetimepicker.js
View File

@ -946,8 +946,7 @@
setPos,
timer = 0,
_xdsoft_datetime,
forEachAncestorOf,
throttle;
forEachAncestorOf;
if (options.id) {
datetimepicker.attr('id', options.id);
@ -1307,7 +1306,7 @@
else if (_this.isValidDate(dTime)) {
_this.currentTime = dTime;
}
else if (!dTime && !requireValidDate && options.allowBlank) {
else if (!dTime && !requireValidDate && options.allowBlank && !options.inline) {
_this.currentTime = null;
}
else {