From aeaaca9e1331b2bbdbd02c8937e38ce9db7423e0 Mon Sep 17 00:00:00 2001 From: Trent Richardson Date: Wed, 15 Dec 2010 15:51:12 -0500 Subject: [PATCH] Changed range check for minDateTime/maxDateTime --- jquery-ui-timepicker-addon.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 09d4593..95b9c57 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -472,6 +472,10 @@ $.extend(Timepicker.prototype, { this._defaults.hourMin = minDateTime.getHours(); this._defaults.minuteMin = minDateTime.getMinutes(); this._defaults.secondMin = minDateTime.getSeconds(); + + if(this.hour < this._defaults.hourMin) this.hour = this._defaults.hourMin; + if(this.minute < this._defaults.minuteMin) this.minute = this._defaults.minuteMin; + if(this.second < this._defaults.secondMin) this.second = this._defaults.secondMin; }else{ this._defaults.hourMin = this.hourMinOriginal; this._defaults.minuteMin = this.minuteMinOriginal; @@ -493,6 +497,10 @@ $.extend(Timepicker.prototype, { this._defaults.hourMax = maxDateTime.getHours(); this._defaults.minuteMax = maxDateTime.getMinutes(); this._defaults.secondMax = maxDateTime.getSeconds(); + + if(this.hour > this._defaults.hourMax) this.hour = this._defaults.hourMax; + if(this.minute > this._defaults.minuteMax) this.minute = this._defaults.minuteMax; + if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax; }else{ this._defaults.hourMax = this.hourMaxOriginal; this._defaults.minuteMax = this.minuteMaxOriginal; @@ -501,12 +509,10 @@ $.extend(Timepicker.prototype, { } if(adjustSliders !== undefined && adjustSliders === true){ - this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax }); - this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax }); - this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax }); + this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax }).slider('value', this.hour); + this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax }).slider('value', this.minute); + this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax }).slider('value', this.second); } - - $.datepicker._setTime(dp_inst, tp_date); },