summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJordan Klassen <forivall@gmail.com>2014-08-22 16:54:21 -0700
committerJordan Klassen <forivall@gmail.com>2014-08-22 16:54:21 -0700
commit60ac9977648d9c098206791f1133b4a07f92d8e3 (patch)
treee782afa9baad8dd16d87911c0090e2193287bcb1 /src
parentab0ea751e7af5fe70d02cdde79d636818d20131b (diff)
downloadjQuery-Timepicker-Addon-60ac9977648d9c098206791f1133b4a07f92d8e3.zip
jQuery-Timepicker-Addon-60ac9977648d9c098206791f1133b4a07f92d8e3.tar.gz
jQuery-Timepicker-Addon-60ac9977648d9c098206791f1133b4a07f92d8e3.tar.bz2
Don't override the inline property in monkey patch
Diffstat (limited to 'src')
-rw-r--r--src/jquery-ui-timepicker-addon.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index e962ac3..99d9530 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -1393,14 +1393,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 {