diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2015-04-19 17:56:15 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2015-04-19 17:56:15 -0400 |
| commit | b523fe1daf766650e1dde15322ac61e99739324b (patch) | |
| tree | b28ec1a827ec1d8a734288c9522668fe787b4a35 /src/jquery-ui-timepicker-addon.js | |
| parent | 8c597e858143d8de3c315d7273cb44b9b72c5c17 (diff) | |
| parent | 211a104f04f2ca0faf44383e94ef71f5488d436f (diff) | |
| download | jQuery-Timepicker-Addon-b523fe1daf766650e1dde15322ac61e99739324b.zip jQuery-Timepicker-Addon-b523fe1daf766650e1dde15322ac61e99739324b.tar.gz jQuery-Timepicker-Addon-b523fe1daf766650e1dde15322ac61e99739324b.tar.bz2 | |
Merge branch 'dev'
Diffstat (limited to 'src/jquery-ui-timepicker-addon.js')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index 5c26af5..b156de8 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -1554,12 +1554,12 @@ $.datepicker._gotoToday = function (id) { var inst = this._getInst($(id)[0]), $dp = inst.dpDiv; - this._base_gotoToday(id); var tp_inst = this._get(inst, 'timepicker'); selectLocalTimezone(tp_inst); var now = new Date(); this._setTime(inst, now); this._setDate(inst, now); + this._base_gotoToday(id); }; /* @@ -1717,7 +1717,8 @@ } var date = this._getDate(inst); - if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) { + var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val()); + if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) { date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec); date.setMicroseconds(tp_inst.microsec); |