diff options
| author | timmywil <timmywillisn@gmail.com> | 2011-10-31 17:31:46 -0400 |
|---|---|---|
| committer | timmywil <timmywillisn@gmail.com> | 2011-10-31 17:31:46 -0400 |
| commit | 0752687612d190f608e64181148ced1a4adfa5d6 (patch) | |
| tree | 479e59471ce529a23082147a67b3f0d8ce5c4e99 | |
| parent | f8a1f7b670df212b2f63064e914952732ac9cf9c (diff) | |
| download | jquery-0752687612d190f608e64181148ced1a4adfa5d6.tar.gz jquery-0752687612d190f608e64181148ced1a4adfa5d6.zip | |
Revert "Landing pull request 530. Fixes coniditional path for tr, td defaultDisplay() calls. Fixes #10416." Fixes #10622.
This reverts commit 22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f.
| -rw-r--r-- | src/effects.js | 2 | ||||
| -rw-r--r-- | test/unit/effects.js | 15 |
2 files changed, 1 insertions, 16 deletions
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); |