summaryrefslogtreecommitdiffstats
path: root/src/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
authoraokros <github@pololand.hu>2014-04-07 15:01:36 +0200
committeraokros <attila.okros@logmein.com>2014-04-07 15:37:19 +0200
commit27fe99a23fc9fa54e84e1b95fbae7e332d3144fc (patch)
tree4a8e587748569b633bee343834ee3edb74d793ac /src/jquery-ui-timepicker-addon.js
parent3d0ada0bd9613864da5af718b6702dc435a24b4b (diff)
downloadjQuery-Timepicker-Addon-27fe99a23fc9fa54e84e1b95fbae7e332d3144fc.zip
jQuery-Timepicker-Addon-27fe99a23fc9fa54e84e1b95fbae7e332d3144fc.tar.gz
jQuery-Timepicker-Addon-27fe99a23fc9fa54e84e1b95fbae7e332d3144fc.tar.bz2
Allow to use datepicker specific setDate arguments
Change is to support the '-1d', '+1m', and such datepicker.setDate arguments with the overridden setDate function.
Diffstat (limited to 'src/jquery-ui-timepicker-addon.js')
-rw-r--r--src/jquery-ui-timepicker-addon.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index 5c7a186..b42fa6c 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -1628,16 +1628,18 @@
* override setDate() to allow setting time too within Date object
*/
$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
- $.datepicker._setDateDatepicker = function (target, date) {
+ $.datepicker._setDateDatepicker = function (target, _date) {
var inst = this._getInst(target);
+ var date = _date;
if (!inst) {
return;
}
- if (typeof(date) === 'string') {
- date = new Date(date);
+ if (typeof(_date) === 'string') {
+ date = new Date(_date);
if (!date.getTime()) {
- $.timepicker.log("Error creating Date object from string.");
+ this._base_setDateDatepicker.apply(this, arguments);
+ date = $(target).datepicker('getDate');
}
}