summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRizziCR <cr@rizzotti-tec.de>2015-04-14 00:00:47 +0200
committerRizziCR <cr@rizzotti-tec.de>2015-04-14 00:00:47 +0200
commitcf32a828a68a00fd5f0f6e7c37a2824e1214d755 (patch)
tree16b8d6c0457f9f5ca455490b46d4a4c18b593bda /src
parentcb8200b31c352a5992a339bb9acf2d3e67c33bbf (diff)
downloadjQuery-Timepicker-Addon-cf32a828a68a00fd5f0f6e7c37a2824e1214d755.zip
jQuery-Timepicker-Addon-cf32a828a68a00fd5f0f6e7c37a2824e1214d755.tar.gz
jQuery-Timepicker-Addon-cf32a828a68a00fd5f0f6e7c37a2824e1214d755.tar.bz2
- Fixed parseTime for altFieldTimeOnly use
Diffstat (limited to 'src')
-rw-r--r--src/jquery-ui-timepicker-addon.js3
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);