diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2013-08-09 05:40:17 -0700 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2013-08-09 05:40:17 -0700 |
| commit | 9d86a293cfb2936eb239d0b31cd32f6255b2003f (patch) | |
| tree | 8d5fa07c12328ffa8428d745130bad06d0e12e69 /src | |
| parent | a34caa884512a1262bc0072fef537f1bd1aebafb (diff) | |
| parent | bc166e45e35fa89ee53a502dfe9d4a09d88567ab (diff) | |
| download | jQuery-Timepicker-Addon-9d86a293cfb2936eb239d0b31cd32f6255b2003f.zip jQuery-Timepicker-Addon-9d86a293cfb2936eb239d0b31cd32f6255b2003f.tar.gz jQuery-Timepicker-Addon-9d86a293cfb2936eb239d0b31cd32f6255b2003f.tar.bz2 | |
Merge pull request #623 from althaus/patch-1
Fixes enable/disable timepicker
Diffstat (limited to 'src')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index 31b7a52..484ada9 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -702,6 +702,9 @@ * on time change is also called when the time is updated in the text field */ _onTimeChange: function () { + if (!this._defaults.showTimepicker) { + return; + } var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false, minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false, second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false, @@ -1485,6 +1488,7 @@ var tp_inst = this._get(inst, 'timepicker'); $(target).datepicker('getDate'); // Init selected[Year|Month|Day] if (tp_inst) { + inst.settings.showTimepicker = false; tp_inst._defaults.showTimepicker = false; tp_inst._updateDateTime(inst); } @@ -1499,6 +1503,7 @@ var tp_inst = this._get(inst, 'timepicker'); $(target).datepicker('getDate'); // Init selected[Year|Month|Day] if (tp_inst) { + inst.settings.showTimepicker = true; tp_inst._defaults.showTimepicker = true; tp_inst._addTimePicker(inst); // Could be disabled on page load tp_inst._updateDateTime(inst); |