Revert "Landing pull request 530. Fixes coniditional path for tr, td defaultDisplay...

This reverts commit 22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f.

diff --git a/src/effects.js b/src/effects.js
index 76d788661e58361adfddd13ba5b3c00fe33c3bbf..67c0c0893771d09e21c8cca0ae34b55952b4f950 100644 (file)
--- 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 b52e2414ff600ba981f2fa0fc8025b95137a8dd2..ca42bad8f44a6e9ec08bfa051e6bde7a7d2a831e 100644 (file)
--- 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);