Merge pull request #587 from Hart2014/master

update to jquery.datetimepicker.full.js to allow for times in a speci…
This commit is contained in:
Valeriy 2017-10-12 12:31:55 +05:00 committed by GitHub
commit 71a6d776e3

View File

@ -4,7 +4,7 @@
*
* Date formatter utility library that allows formatting date/time variables or Date objects using PHP DateTime format.
* This library is a standalone javascript library and does not depend on other libraries or plugins like jQuery.
*
*
* @see http://php.net/manual/en/function.date.php
*
* For more JQuery plugins visit http://plugins.krajee.com
@ -2344,6 +2344,9 @@ var DateFormatter;
optionDateTime.setHours(h);
optionDateTime.setMinutes(m);
classes = [];
if (options.disabledDates.indexOf(dateHelper.formatDate(optionDateTime, options.formatDate)) !== -1) {
classes.push('xdsoft_disabled');
}
if ((options.minDateTime !== false && options.minDateTime > optionDateTime) || (options.maxTime !== false && _xdsoft_datetime.strtotime(options.maxTime).getTime() < now.getTime()) || (options.minTime !== false && _xdsoft_datetime.strtotime(options.minTime).getTime() > now.getTime())) {
classes.push('xdsoft_disabled');
} else if ((options.minDateTime !== false && options.minDateTime > optionDateTime) || ((options.disabledMinTime !== false && now.getTime() > _xdsoft_datetime.strtotime(options.disabledMinTime).getTime()) && (options.disabledMaxTime !== false && now.getTime() < _xdsoft_datetime.strtotime(options.disabledMaxTime).getTime()))) {