deac/jQuery-Timepicker-Addon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #175 from alexandergitter/dev

Browse source 
Fix issue #149, sliders max values should not allow for partial steps
This commit is contained in:
Trent Richardson 2011-06-08 08:26:34 -07:00
parent 2e45f5c352 7c4aab0419
commit b930a6a87d
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
jquery-ui-timepicker-addon.js vendored
View file

@ -569,7 +569,7 @@ $.extend(Timepicker.prototype, {
this._defaults.minuteMax = maxDateTime.getMinutes(); this._defaults.minuteMax = maxDateTime.getMinutes();
if (this.minute >= this._defaults.minuteMax) { if (this.minute >= this._defaults.minuteMax) {
this.minute = this._defaults.minuteMax; this.minute = this._defaults.minuteMax;
this._defaults.secondMin = maxDateTime.getSeconds(); this._defaults.secondMax = maxDateTime.getSeconds();
} else { } else {
if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax; if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax;
this._defaults.secondMax = this.secondMaxOriginal; this._defaults.secondMax = this.secondMaxOriginal;
@ -586,9 +586,13 @@ $.extend(Timepicker.prototype, {
} }
if(adjustSliders !== undefined && adjustSliders === true){ if(adjustSliders !== undefined && adjustSliders === true){
this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax }).slider('value', this.hour); var hourMax = (this._defaults.hourMax - (this._defaults.hourMax % this._defaults.stepHour)).toFixed(0),
this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax }).slider('value', this.minute); minMax = (this._defaults.minuteMax - (this._defaults.minuteMax % this._defaults.stepMinute)).toFixed(0),
this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax }).slider('value', this.second); secMax = (this._defaults.secondMax - (this._defaults.secondMax % this._defaults.stepSecond)).toFixed(0);
this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
} }
}, },