diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2010-12-08 11:52:52 -0500 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2010-12-08 11:52:52 -0500 |
| commit | 678fa3524391d540fd08f3669a5757dc63eba92f (patch) | |
| tree | 103fd0ac4ddc3433441a9b6e447b2ea37197033e /jquery-ui-timepicker-addon.js | |
| parent | a539339bc4b95582b8c7cac682c14683a6395166 (diff) | |
| download | jQuery-Timepicker-Addon-678fa3524391d540fd08f3669a5757dc63eba92f.zip jQuery-Timepicker-Addon-678fa3524391d540fd08f3669a5757dc63eba92f.tar.gz jQuery-Timepicker-Addon-678fa3524391d540fd08f3669a5757dc63eba92f.tar.bz2 | |
Fixed getDate for timepicker if not yet been opened
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 60b11b0..fc174a8 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -738,11 +738,15 @@ $.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker; $.datepicker._getDateDatepicker = function(target, noDefault) { var inst = this._getInst(target), tp_inst = this._get(inst, 'timepicker'); - if (tp_inst) + + if (tp_inst){ + this._setDateFromField(inst, noDefault); + this._updateDatepicker(inst); + return (!inst.currentYear || (inst.input && inst.input.val() == '')) ? null : (new Date(inst.currentYear, inst.currentMonth, inst.currentDay, tp_inst.hour, tp_inst.minute, tp_inst.second)); - + } return this._base_getDateDatepicker(target, noDefault); }; |