diff options
| author | Adam Parod <mystic414@gmail.com> | 2011-02-17 15:17:40 -0600 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-03-08 00:52:07 -0600 |
| commit | 18ad8ffb3df0992b2fd241a4602eff5d799dfdc3 (patch) | |
| tree | 2954286db00fb3524ce91132119a3e8da35cc178 | |
| parent | 4ad513b7f0b508c03b94066beb95b171a05043f1 (diff) | |
| download | jquery-ui-18ad8ffb3df0992b2fd241a4602eff5d799dfdc3.tar.gz jquery-ui-18ad8ffb3df0992b2fd241a4602eff5d799dfdc3.zip | |
Datepicker: Reformat minDate/maxDate when dateFormat changes. Fixes #7009 - Reformat minDate/maxDate when dateFormat changes.
| -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); |