Landing pull request 530. Fixes coniditional path for tr, td defaultD…

…isplay() calls. Fixes #10416. More Details: - #530 - http://bugs.jquery.com/ticket/10416
jquery · Oct 4, 2011 · 22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f · 22f2e8b
1 parent 749d32a
commit 22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f
Unified Split

Showing with 16 additions and 1 deletion.

+1 −1 src/effects.js

+15 −0 test/unit/effects.js
diff --git a/src/effects.js b/src/effects.js
@@ -38,7 +38,7 @@ jQuery.fn.extend({
 					// Set elements which have been overridden with display: none
 					// in a stylesheet to whatever the default browser style is
 					// for such an element
-  
-					if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+  
+					if ( display === "none" || ( display === ""  && jQuery.css( elem, "display" ) === "none" ) ) {
 						jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
 					}
 				}

diff --git a/test/unit/effects.js b/test/unit/effects.js
@@ -188,6 +188,21 @@ test("show() resolves correct default display #8099", function() {
 });
+  
+test("defaultDisplay() correctly determines tr, td display #10416", function() {
+  
+
+  
+	expect( 1 );
+  
+	var tr = "<tr></tr>",
+  
+			td = "<td>new</td>";
+  
+
+  
+	jQuery( tr ).append( td ).appendTo( "#table" );
+  
+	jQuery( tr ).hide().append( td ).appendTo( "#table" ).show();
+  
+
+  
+	equal(
+  
+		jQuery( "#table" ).find( "tr" ).eq( 1 ).css( "display" ),
+  
+		jQuery( "#table" ).find( "tr" ).eq( 0 ).css( "display" ),
+  
+		"defaultDisplay() returns correct tr display values"
+  
+	);
+  
+});
 test("animate(Hash, Object, Function)", function() {
 	expect(1);