mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
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
This commit is contained in:
parent
749d32a290
commit
22f2e8b3dc
2
src/effects.js
vendored
2
src/effects.js
vendored
@ -38,7 +38,7 @@ jQuery.fn.extend({
|
|||||||
// Set elements which have been overridden with display: none
|
// Set elements which have been overridden with display: none
|
||||||
// in a stylesheet to whatever the default browser style is
|
// in a stylesheet to whatever the default browser style is
|
||||||
// for such an element
|
// 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));
|
jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
15
test/unit/effects.js
vendored
15
test/unit/effects.js
vendored
@ -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() {
|
test("animate(Hash, Object, Function)", function() {
|
||||||
expect(1);
|
expect(1);
|
||||||
|
Loading…
Reference in New Issue
Block a user