Use actual min/maxDateTime values which might have been set via
$(...).datetimepicker.('option', 'min/maxDateTime' ...)
This commit is contained in:
parent
b61905a515
commit
2e9005b2e8
8
jquery-ui-timepicker-addon.js
vendored
8
jquery-ui-timepicker-addon.js
vendored
|
@ -519,8 +519,8 @@ $.extend(Timepicker.prototype, {
|
||||||
|
|
||||||
if(!this._defaults.showTimepicker) return; // No time so nothing to check here
|
if(!this._defaults.showTimepicker) return; // No time so nothing to check here
|
||||||
|
|
||||||
if(this._defaults.minDateTime !== null && dp_date){
|
if($.datepicker._get(dp_inst, 'minDateTime') !== null && dp_date){
|
||||||
var minDateTime = this._defaults.minDateTime,
|
var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
|
||||||
minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
|
minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
|
||||||
|
|
||||||
if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null){
|
if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null){
|
||||||
|
@ -552,8 +552,8 @@ $.extend(Timepicker.prototype, {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this._defaults.maxDateTime !== null && dp_date){
|
if($.datepicker._get(dp_inst, 'maxDateTime') !== null && dp_date){
|
||||||
var maxDateTime = this._defaults.maxDateTime,
|
var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
|
||||||
maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
|
maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
|
||||||
|
|
||||||
if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
|
if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
|
||||||
|
|
Loading…
Reference in a new issue