aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/effects.js2
-rw-r--r--test/unit/effects.js15
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);