Merge pull request #739 from kokaia/master

bugfix: infinite loop
This commit is contained in:
Valeriy Chupurnov 2020-06-23 12:15:41 +03:00 committed by GitHub
commit 7898b5e4c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1667,7 +1667,7 @@ var datetimepickerFactory = function ($) {
clearTimeout(xchangeTimer); clearTimeout(xchangeTimer);
xchangeTimer = setTimeout(function () { xchangeTimer = setTimeout(function () {
if (_xdsoft_datetime.currentTime === undefined || _xdsoft_datetime.currentTime === null) { if (_xdsoft_datetime.currentTime === undefined || _xdsoft_datetime.currentTime === null || isNaN(_xdsoft_datetime.currentTime.getTime())) {
_xdsoft_datetime.currentTime = _xdsoft_datetime.now(); _xdsoft_datetime.currentTime = _xdsoft_datetime.now();
} }