Skip to content

Commit aeaaca9

Browse files
Changed range check for minDateTime/maxDateTime
1 parent 8e12e45 commit aeaaca9

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

jquery-ui-timepicker-addon.js

+11-5
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,10 @@ $.extend(Timepicker.prototype, {
472472
this._defaults.hourMin = minDateTime.getHours();
473473
this._defaults.minuteMin = minDateTime.getMinutes();
474474
this._defaults.secondMin = minDateTime.getSeconds();
475+
476+
if(this.hour < this._defaults.hourMin) this.hour = this._defaults.hourMin;
477+
if(this.minute < this._defaults.minuteMin) this.minute = this._defaults.minuteMin;
478+
if(this.second < this._defaults.secondMin) this.second = this._defaults.secondMin;
475479
}else{
476480
this._defaults.hourMin = this.hourMinOriginal;
477481
this._defaults.minuteMin = this.minuteMinOriginal;
@@ -493,6 +497,10 @@ $.extend(Timepicker.prototype, {
493497
this._defaults.hourMax = maxDateTime.getHours();
494498
this._defaults.minuteMax = maxDateTime.getMinutes();
495499
this._defaults.secondMax = maxDateTime.getSeconds();
500+
501+
if(this.hour > this._defaults.hourMax) this.hour = this._defaults.hourMax;
502+
if(this.minute > this._defaults.minuteMax) this.minute = this._defaults.minuteMax;
503+
if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax;
496504
}else{
497505
this._defaults.hourMax = this.hourMaxOriginal;
498506
this._defaults.minuteMax = this.minuteMaxOriginal;
@@ -501,12 +509,10 @@ $.extend(Timepicker.prototype, {
501509
}
502510

503511
if(adjustSliders !== undefined && adjustSliders === true){
504-
this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax });
505-
this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax });
506-
this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax });
512+
this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax }).slider('value', this.hour);
513+
this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax }).slider('value', this.minute);
514+
this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax }).slider('value', this.second);
507515
}
508-
509-
$.datepicker._setTime(dp_inst, tp_date);
510516

511517
},
512518

0 commit comments

Comments
 (0)