diff options
| author | Trent Richardson <trentrichardson@users.noreply.github.com> | 2015-04-14 08:31:32 -0400 |
|---|---|---|
| committer | Trent Richardson <trentrichardson@users.noreply.github.com> | 2015-04-14 08:31:32 -0400 |
| commit | 7f5ff9126ff706f49b14822108977a0d9722effe (patch) | |
| tree | 16b8d6c0457f9f5ca455490b46d4a4c18b593bda /src | |
| parent | cb8200b31c352a5992a339bb9acf2d3e67c33bbf (diff) | |
| parent | cf32a828a68a00fd5f0f6e7c37a2824e1214d755 (diff) | |
| download | jQuery-Timepicker-Addon-7f5ff9126ff706f49b14822108977a0d9722effe.zip jQuery-Timepicker-Addon-7f5ff9126ff706f49b14822108977a0d9722effe.tar.gz jQuery-Timepicker-Addon-7f5ff9126ff706f49b14822108977a0d9722effe.tar.bz2 | |
Merge pull request #801 from RizziCR/dev
- Fixed parseTime for altFieldTimeOnly use
Diffstat (limited to 'src')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index 5c26af5..f789346 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -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); |