diff options
| author | gnarf <gnarf@gnarf.net> | 2011-03-07 11:15:28 -0600 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-03-07 11:15:28 -0600 |
| commit | fefb29d825a482a4c7006b0c91f440f3b024dbd2 (patch) | |
| tree | 1a9c96bada02f87a843a10ea12dfda684b228003 /ui/jquery.ui.datepicker.js | |
| parent | b6debf4daf015173de904a361ddb1041fc9474a8 (diff) | |
| parent | d7979a8b7150ac36f6f57ad0c18c49a46965797c (diff) | |
| download | jquery-ui-fefb29d825a482a4c7006b0c91f440f3b024dbd2.tar.gz jquery-ui-fefb29d825a482a4c7006b0c91f440f3b024dbd2.zip | |
Merge branch 'master' into effects-api
Diffstat (limited to 'ui/jquery.ui.datepicker.js')
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index c23984530..8dd9bf3dc 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -444,7 +444,14 @@ $.extend(Datepicker.prototype, { this._hideDatepicker(); } var date = this._getDateDatepicker(target, true); + var minDate = this._getMinMaxDate(inst, 'min'); + var maxDate = this._getMinMaxDate(inst, 'max'); extendRemove(inst.settings, settings); + // reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided + if (minDate !== null && settings['dateFormat'] !== undefined && settings['minDate'] === undefined) + inst.settings.minDate = this._formatDate(inst, minDate); + if (maxDate !== null && settings['dateFormat'] !== undefined && settings['maxDate'] === undefined) + inst.settings.maxDate = this._formatDate(inst, maxDate); this._attachments($(target), inst); this._autoSize(inst); this._setDateDatepicker(target, date); |