diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2014-08-28 09:59:40 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2014-08-28 09:59:40 -0400 |
| commit | 320653c272485ea4ade93321894ace8237cf1f4f (patch) | |
| tree | fcb9d3fbb4d9c80395840a7beffaf5be6df489ed /dist/jquery-ui-timepicker-addon.js | |
| parent | 9cfc82b96c02530ef56c017b798c9f740db76e65 (diff) | |
| download | jQuery-Timepicker-Addon-320653c272485ea4ade93321894ace8237cf1f4f.zip jQuery-Timepicker-Addon-320653c272485ea4ade93321894ace8237cf1f4f.tar.gz jQuery-Timepicker-Addon-320653c272485ea4ade93321894ace8237cf1f4f.tar.bz2 | |
Update to #753 to fix closing and odd focusing on input
Diffstat (limited to 'dist/jquery-ui-timepicker-addon.js')
| -rw-r--r-- | dist/jquery-ui-timepicker-addon.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js index 4869e0e..e5ec89a 100644 --- a/dist/jquery-ui-timepicker-addon.js +++ b/dist/jquery-ui-timepicker-addon.js @@ -1387,14 +1387,17 @@ $.datepicker._base_selectDate = $.datepicker._selectDate; $.datepicker._selectDate = function (id, dateStr) { var inst = this._getInst($(id)[0]), - tp_inst = this._get(inst, 'timepicker'); + tp_inst = this._get(inst, 'timepicker'), + was_inline; if (tp_inst && inst.settings.showTimepicker) { tp_inst._limitMinMaxDateTime(inst, true); + was_inline = inst.inline; inst.inline = inst.stay_open = true; //This way the onSelect handler called from calendarpicker get the full dateTime this._base_selectDate(id, dateStr); - inst.inline = inst.stay_open = false; + inst.inline = was_inline; + inst.stay_open = false; this._notifyChange(inst); this._updateDatepicker(inst); } else { @@ -1529,7 +1532,7 @@ selectLocalTimezone(tp_inst); var now = new Date(); this._setTime(inst, now); - $('.ui-datepicker-today', $dp).click(); + this._setDate(inst, now); }; /* |