From: Andrew Powell <andrew@shellcape.org>
Date: Thu, 12 May 2011 15:28:37 +0000 (-0400)
Subject: Datepicker: removed conditional mozilla browser check block. Fixes #7322 - Year selec... 
X-Git-Tag: 1.8.13~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=10fa7f9ae9ea68ac11795862a2ccdc813256eb8e;p=jquery-ui.git

Datepicker: removed conditional mozilla browser check block. Fixes #7322 - Year selector disappears after setting an option in Firefox
(cherry picked from commit a6227be2c09da2c698ee6d5251ac113b90585522)
---

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');