diff options
| author | Rick Waldron <waldron.rick@gmail.com> | 2011-10-04 15:53:19 -0400 |
|---|---|---|
| committer | timmywil <timmywillisn@gmail.com> | 2011-10-04 15:53:19 -0400 |
| commit | 22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f (patch) | |
| tree | 33b96a4af9188a9220a2547033b5dff16a038707 | |
| parent | 749d32a290d8d22a662ffc18db2fb035b401564d (diff) | |
| download | jquery-22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f.tar.gz jquery-22f2e8b3dc18dede5f1ccb28cbdf8cb5bcde115f.zip | |
Landing pull request 530. Fixes coniditional path for tr, td defaultDisplay() calls. Fixes #10416.
More Details:
- https://github.com/jquery/jquery/pull/530
- http://bugs.jquery.com/ticket/10416
| -rw-r--r-- | src/effects.js | 2 | ||||
| -rw-r--r-- | test/unit/effects.js | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/effects.js b/src/effects.js index e14235bc4..67ac8bb41 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 === "" && jQuery.css( elem, "display" ) === "none" ) { + if ( display === "none" || ( 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 24f1b53f9..2492ea08c 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -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); |