diff options
| author | Andrew Powell <andrew@shellcape.org> | 2011-05-12 11:28:37 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-12 11:29:13 -0400 |
| commit | 10fa7f9ae9ea68ac11795862a2ccdc813256eb8e (patch) | |
| tree | d94055433e5e89078fc124c631c760f2f2ad90da | |
| parent | 804ba0a2df3a98db5929474daa3f664b7a3d5f29 (diff) | |
| download | jquery-ui-10fa7f9ae9ea68ac11795862a2ccdc813256eb8e.tar.gz jquery-ui-10fa7f9ae9ea68ac11795862a2ccdc813256eb8e.zip | |
Datepicker: removed conditional mozilla browser check block. Fixes #7322 - Year selector disappears after setting an option in Firefox
(cherry picked from commit a6227be2c09da2c698ee6d5251ac113b90585522)
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index 996528937..93d468c36 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -705,7 +705,7 @@ $.extend(Datepicker.prototype, { var origyearshtml = inst.yearshtml; setTimeout(function(){ //assure that inst.yearshtml didn't change. - if( origyearshtml === inst.yearshtml ){ + if( origyearshtml === inst.yearshtml && inst.yearshtml ){ inst.dpDiv.find('select.ui-datepicker-year:first').replaceWith(inst.yearshtml); } origyearshtml = inst.yearshtml = null; @@ -1602,14 +1602,9 @@ $.extend(Datepicker.prototype, { '>' + year + '</option>'; } inst.yearshtml += '</select>'; - //when showing there is no need for later update - if( ! $.browser.mozilla ){ - html += inst.yearshtml; - inst.yearshtml = null; - } else { - // will be replaced later with inst.yearshtml - html += '<select class="ui-datepicker-year"><option value="' + drawYear + '" selected="selected">' + drawYear + '</option></select>'; - } + + html += inst.yearshtml; + inst.yearshtml = null; } } html += this._get(inst, 'yearSuffix'); |