diff options
| author | Trent Richardson <trentrichardson@users.noreply.github.com> | 2014-04-07 09:45:16 -0400 |
|---|---|---|
| committer | Trent Richardson <trentrichardson@users.noreply.github.com> | 2014-04-07 09:45:16 -0400 |
| commit | 31c19d9f70ca8dc5b30e20aeb8c2c163fa3a70da (patch) | |
| tree | 4a8e587748569b633bee343834ee3edb74d793ac /src | |
| parent | 3d0ada0bd9613864da5af718b6702dc435a24b4b (diff) | |
| parent | 27fe99a23fc9fa54e84e1b95fbae7e332d3144fc (diff) | |
| download | jQuery-Timepicker-Addon-31c19d9f70ca8dc5b30e20aeb8c2c163fa3a70da.zip jQuery-Timepicker-Addon-31c19d9f70ca8dc5b30e20aeb8c2c163fa3a70da.tar.gz jQuery-Timepicker-Addon-31c19d9f70ca8dc5b30e20aeb8c2c163fa3a70da.tar.bz2 | |
Merge pull request #713 from aokros/dev
Allow to use datepicker specific setDate arguments
Diffstat (limited to 'src')
| -rw-r--r-- | src/jquery-ui-timepicker-addon.js | 10 |
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'); } } |