diff options
author | Trent Richardson <trentdrichardson@gmail.com> | 2014-02-07 09:54:20 -0500 |
---|---|---|
committer | Trent Richardson <trentdrichardson@gmail.com> | 2014-02-07 09:54:20 -0500 |
commit | 9057dc00d8cf1e29f60bb0209ef29ca84f2fcb1b (patch) | |
tree | 2ab86fe8c450b7f78fa4a0993cfb8163748dbb43 /dist/jquery-ui-timepicker-addon.js | |
parent | d4b12fbdda7c356ab745bd595a97c0c4afb50f1c (diff) | |
download | jQuery-Timepicker-Addon-9057dc00d8cf1e29f60bb0209ef29ca84f2fcb1b.zip jQuery-Timepicker-Addon-9057dc00d8cf1e29f60bb0209ef29ca84f2fcb1b.tar.gz jQuery-Timepicker-Addon-9057dc00d8cf1e29f60bb0209ef29ca84f2fcb1b.tar.bz2 |
Fix #689 - step option not being set for select dropdowns
Diffstat (limited to 'dist/jquery-ui-timepicker-addon.js')
-rw-r--r-- | dist/jquery-ui-timepicker-addon.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js index b7e5adc..fcf3068 100644 --- a/dist/jquery-ui-timepicker-addon.js +++ b/dist/jquery-ui-timepicker-addon.js @@ -1,6 +1,6 @@ -/*! jQuery Timepicker Addon - v1.4.3 - 2013-11-30 +/*! jQuery Timepicker Addon - v1.4.4 - 2013-11-30 * http://trentrichardson.com/examples/timepicker -* Copyright (c) 2013 Trent Richardson; Licensed MIT */ +* Copyright (c) 2014 Trent Richardson; Licensed MIT */ (function ($) { /* @@ -16,7 +16,7 @@ */ $.extend($.ui, { timepicker: { - version: "1.4.3" + version: "1.4.4" } }); @@ -668,23 +668,23 @@ microsecMax = parseInt((this._defaults.microsecMax - ((this._defaults.microsecMax - this._defaults.microsecMin) % this._defaults.stepMicrosec)), 10); if (this.hour_slider) { - this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax }); + this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax, step: this._defaults.stepHour }); this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour)); } if (this.minute_slider) { - this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax }); + this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax, step: this._defaults.stepMinute }); this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute)); } if (this.second_slider) { - this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax }); + this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax, step: this._defaults.stepSecond }); this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond)); } if (this.millisec_slider) { - this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax }); + this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax, step: this._defaults.stepMillisec }); this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec)); } if (this.microsec_slider) { - this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax }); + this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax, step: this._defaults.stepMicrosec }); this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec)); } } @@ -1342,7 +1342,7 @@ var inst = this._getInst($(id)[0]), tp_inst = this._get(inst, 'timepicker'); - if (tp_inst) { + if (tp_inst && inst.settings.showTimepicker) { tp_inst._limitMinMaxDateTime(inst, true); inst.inline = inst.stay_open = true; //This way the onSelect handler called from calendarpicker get the full dateTime @@ -2140,6 +2140,6 @@ /* * Keep up with the version */ - $.timepicker.version = "1.4.3"; + $.timepicker.version = "1.4.4"; })(jQuery); |