From: timmywil <timmywillisn@gmail.com>
Date: Mon, 31 Oct 2011 21:31:46 +0000 (-0400)
Subject: Revert "Landing pull request 530. Fixes coniditional path for tr, td defaultDisplay... 
X-Git-Tag: 1.7~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0752687612d190f608e64181148ced1a4adfa5d6;p=jquery.git

Revert "Landing pull request 530. Fixes coniditional path for tr, td defaultDisplay() calls. Fixes #10416." Fixes #10622.

This reverts commit 22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f.
---

diff --git a/src/effects.js b/src/effects.js
index 76d788661..67c0c0893 100644
--- 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 === "none" || ( display === ""  && jQuery.css( elem, "display" ) === "none" ) ) {
+					if ( 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
index b52e2414f..ca42bad8f 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -188,21 +188,6 @@ 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);