From: rwldrn <waldron.rick@gmail.com>
Date: Mon, 31 Jan 2011 19:31:15 +0000 (-0500)
Subject: Bug #8099 - Always restore to correct display value based on element's expected defau... 
X-Git-Tag: 1.5.1rc1~16^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0d2e4796dc97d3f9d6b5c1977e883b3ddf2f53d9;p=jquery.git

Bug #8099 - Always restore to correct display value based on element's expected default display
---

diff --git a/src/effects.js b/src/effects.js
index b0675395f..c73fd929e 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -505,17 +505,38 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 }
 
 function defaultDisplay( nodeName ) {
+	var stylesheets = document.styleSheets,
+			disabled = [],
+			elem, display;
+
 	if ( !elemdisplay[ nodeName ] ) {
-		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
-			display = elem.css("display");
 
+		// #8099 - If the end-dev has globally changed a default
+		// display, we can temporarily disable their styles to check
+		// for the correct default value
+		jQuery.each( stylesheets, function( idx, obj ) { 
+			disabled[ idx ] = obj.disabled;
+			obj.disabled = true;
+		}); 
+		
+		// Create a temp element and check it's default display
+		elem = jQuery("<" + nodeName + ">").appendTo("body"),
+		display = elem.css("display");
+		
+		// Remove temp element
 		elem.remove();
 
 		if ( display === "none" || display === "" ) {
 			display = "block";
 		}
-
+		
+		// Store the correct default display
 		elemdisplay[ nodeName ] = display;
+
+		// Restore stylesheets
+		jQuery.each( stylesheets, function( idx, obj ) {
+			this.disabled = disabled[ idx ];
+		});
 	}
 
 	return elemdisplay[ nodeName ];
diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index cffaaa46a..9ca2cd748 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -109,3 +109,6 @@ div#show-tests * { display: none; }
 #nothiddendiv { font-size: 16px; }
 #nothiddendivchild.em { font-size: 2em; }
 #nothiddendivchild.prct { font-size: 150%; }
+
+/* 8099 changes to default styles are read correctly */
+tt { display: none; }
diff --git a/test/unit/effects.js b/test/unit/effects.js
index b1dd28840..ce9c16c8c 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -169,6 +169,18 @@ test("Persist correct display value", function() {
   });
 });
 
+test("show() resolves correct default display #8099", function() {
+	expect(3);
+	var bug8099 = jQuery("<tt/>").appendTo("#main");
+
+	equals( bug8099.css("display"), "none", "default display override for all tt" );
+	equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+	bug8099.remove();
+
+	equals( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
+});
+
 test("animate(Hash, Object, Function)", function() {
 	expect(1);
 	stop();