Permalink
Browse files

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

…defaultDisplay() calls. Fixes #10416." Fixes #10622.

This reverts commit 22f2e8b.
  • Loading branch information...
1 parent f8a1f7b commit 0752687612d190f608e64181148ced1a4adfa5d6 timmywil committed Oct 31, 2011
Showing with 1 addition and 16 deletions.
  1. +1 −1 src/effects.js
  2. +0 −15 test/unit/effects.js
View
@@ -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));
}
}
View
@@ -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);

0 comments on commit 0752687

Please sign in to comment.