summaryrefslogtreecommitdiffstats
path: root/src/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2014-08-21 16:01:56 -0400
committerTrent Richardson <trentdrichardson@gmail.com>2014-08-21 16:01:56 -0400
commit915d275bec6a74fe0566c3dac5832507720d1d93 (patch)
treee4bf2a2b35b9b531b9472710727378fe60f1fe51 /src/jquery-ui-timepicker-addon.js
parent80f505028f304a5beeaaf727805ca8ad0a30953d (diff)
downloadjQuery-Timepicker-Addon-915d275bec6a74fe0566c3dac5832507720d1d93.zip
jQuery-Timepicker-Addon-915d275bec6a74fe0566c3dac5832507720d1d93.tar.gz
jQuery-Timepicker-Addon-915d275bec6a74fe0566c3dac5832507720d1d93.tar.bz2
Fixes #750 - datetimeRange clears the time portion when prepopulated
Diffstat (limited to 'src/jquery-ui-timepicker-addon.js')
-rw-r--r--src/jquery-ui-timepicker-addon.js17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index 86ae555..e962ac3 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -1767,7 +1767,10 @@
onselect = null,
overrides = tp_inst._defaults.evnts,
fns = {},
- prop;
+ prop,
+ ret,
+ oldVal,
+ $target;
if (typeof name === 'string') { // if min/max was set with the string
if (name === 'minDate' || name === 'minDateTime') {
min = value;
@@ -1825,11 +1828,21 @@
} else if (onselect) {
tp_inst._defaults.onSelect = onselect;
}
+
+ // Datepicker will override our date when we call _base_optionDatepicker when
+ // calling minDate/maxDate, so we will first grab the value, call
+ // _base_optionDatepicker, then set our value back.
+ if(min || max){
+ $target = $(target);
+ oldVal = $target.datetimepicker('getDate');
+ ret = this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
+ $target.datetimepicker('setDate', oldVal);
+ return ret;
+ }
}
if (value === undefined) {
return this._base_optionDatepicker.call($.datepicker, target, name);
}
-
return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
};