summaryrefslogtreecommitdiffstats
path: root/src/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
authorejazrasool <er.usmani@gmail.com>2016-01-19 06:38:54 +0500
committerejazrasool <er.usmani@gmail.com>2016-01-19 06:38:54 +0500
commit5052dbbaaaa59cc29a93f5d3cff81c5bb5d790ed (patch)
tree3ad03e23cc6a86d9827e5365b292ce4ecd2f17d6 /src/jquery-ui-timepicker-addon.js
parentd6b3b4258c152a6faac0771b0ad9a0f4b719eb17 (diff)
downloadjQuery-Timepicker-Addon-5052dbbaaaa59cc29a93f5d3cff81c5bb5d790ed.zip
jQuery-Timepicker-Addon-5052dbbaaaa59cc29a93f5d3cff81c5bb5d790ed.tar.gz
jQuery-Timepicker-Addon-5052dbbaaaa59cc29a93f5d3cff81c5bb5d790ed.tar.bz2
fix the getDate() to always return date and time
Diffstat (limited to 'src/jquery-ui-timepicker-addon.js')
-rw-r--r--src/jquery-ui-timepicker-addon.js21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index d975aa1..7a5c14c 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -1735,7 +1735,26 @@
}
var date = this._getDate(inst);
- var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val());
+
+ var currDT = null;
+
+ if (tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) {
+ currDT = tp_inst.$input.val() + ' ' + tp_inst.$altInput.val();
+ }
+ else if (tp_inst.$input.get(0).tagName != 'INPUT' && tp_inst.$altInput) {
+ /**
+ * in case the datetimepicker has been applied to a non-input tag for inline UI,
+ * and the user has not configured the plugin to display only time in altInput,
+ * pick current date time from the altInput (and hope for the best, for now, until "ER1" is applied)
+ *
+ * @todo ER1. Since altInput can have a totally difference format, convert it to standard format by reading input format from "altFormat" and "altTimeFormat" option values
+ */
+ currDT = tp_inst.$altInput.val();
+ }
+ else {
+ currDT = 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);