Skip to content

Commit 7c4aab0

Browse files
author
Alexander Gitter
committed
Fix trentrichardson#149, sliders max values should not allow for partial steps
1 parent d4187fb commit 7c4aab0

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

jquery-ui-timepicker-addon.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ $.extend(Timepicker.prototype, {
569569
this._defaults.minuteMax = maxDateTime.getMinutes();
570570
if (this.minute >= this._defaults.minuteMax) {
571571
this.minute = this._defaults.minuteMax;
572-
this._defaults.secondMin = maxDateTime.getSeconds();
572+
this._defaults.secondMax = maxDateTime.getSeconds();
573573
} else {
574574
if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax;
575575
this._defaults.secondMax = this.secondMaxOriginal;
@@ -586,9 +586,13 @@ $.extend(Timepicker.prototype, {
586586
}
587587

588588
if(adjustSliders !== undefined && adjustSliders === true){
589-
this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax }).slider('value', this.hour);
590-
this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax }).slider('value', this.minute);
591-
this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax }).slider('value', this.second);
589+
var hourMax = (this._defaults.hourMax - (this._defaults.hourMax % this._defaults.stepHour)).toFixed(0),
590+
minMax = (this._defaults.minuteMax - (this._defaults.minuteMax % this._defaults.stepMinute)).toFixed(0),
591+
secMax = (this._defaults.secondMax - (this._defaults.secondMax % this._defaults.stepSecond)).toFixed(0);
592+
593+
this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
594+
this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
595+
this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
592596
}
593597

594598
},

0 commit comments

Comments
 (0)