Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…isplay() calls. Fixes #10416.

More Details:
 - #530
 - http://bugs.jquery.com/ticket/10416
  • Loading branch information...
commit 22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f 1 parent 749d32a
Rick Waldron rwaldron authored timmywil committed
Showing with 16 additions and 1 deletion.
  1. +1 −1  src/effects.js
  2. +15 −0 test/unit/effects.js
2  src/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 === "" && jQuery.css( elem, "display" ) === "none" ) {
+ if ( display === "none" || ( display === "" && jQuery.css( elem, "display" ) === "none" ) ) {
jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
}
}
15 test/unit/effects.js
View
@@ -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);
Please sign in to comment.
Something went wrong with that request. Please try again.