diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2011-06-22 06:34:40 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2011-06-22 06:34:40 -0400 |
| commit | ae64213f33d52c787e125609c243bbd7caf693dd (patch) | |
| tree | 5726f8e3e64dd40ca618d4a8bef88aba4744d3b8 | |
| parent | 0595fd749bef322642e75110da77274d58cb7f21 (diff) | |
| download | jQuery-Timepicker-Addon-ae64213f33d52c787e125609c243bbd7caf693dd.zip jQuery-Timepicker-Addon-ae64213f33d52c787e125609c243bbd7caf693dd.tar.gz jQuery-Timepicker-Addon-ae64213f33d52c787e125609c243bbd7caf693dd.tar.bz2 | |
apply fix by alexandergitter for setTime to work
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 33216a9..99a2ebc 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -590,9 +590,12 @@ $.extend(Timepicker.prototype, { minMax = (this._defaults.minuteMax - (this._defaults.minuteMax % this._defaults.stepMinute)).toFixed(0), 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); + if(this.hour_slider) + this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour); + if(this.minute_slider) + this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute); + if(this.second_slider) + this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second); } }, @@ -629,6 +632,9 @@ $.extend(Timepicker.prototype, { if (minute !== false) this.minute = minute; if (second !== false) this.second = second; if (timezone !== false) this.timezone = timezone; + + if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]); + this._limitMinMaxDateTime(this.inst, true); } if (this._defaults.ampm) this.ampm = ampm; |