Bug #8099 - Always restore to correct display value based on element's expected default display
This commit is contained in:
parent
e0b1bb8e3d
commit
0d2e4796dc
27
src/effects.js
vendored
27
src/effects.js
vendored
|
@ -505,17 +505,38 @@ if ( jQuery.expr && jQuery.expr.filters ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultDisplay( nodeName ) {
|
function defaultDisplay( nodeName ) {
|
||||||
if ( !elemdisplay[ nodeName ] ) {
|
var stylesheets = document.styleSheets,
|
||||||
var elem = jQuery("<" + nodeName + ">").appendTo("body"),
|
disabled = [],
|
||||||
display = elem.css("display");
|
elem, display;
|
||||||
|
|
||||||
|
if ( !elemdisplay[ nodeName ] ) {
|
||||||
|
|
||||||
|
// #8099 - If the end-dev has globally changed a default
|
||||||
|
// display, we can temporarily disable their styles to check
|
||||||
|
// for the correct default value
|
||||||
|
jQuery.each( stylesheets, function( idx, obj ) {
|
||||||
|
disabled[ idx ] = obj.disabled;
|
||||||
|
obj.disabled = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Create a temp element and check it's default display
|
||||||
|
elem = jQuery("<" + nodeName + ">").appendTo("body"),
|
||||||
|
display = elem.css("display");
|
||||||
|
|
||||||
|
// Remove temp element
|
||||||
elem.remove();
|
elem.remove();
|
||||||
|
|
||||||
if ( display === "none" || display === "" ) {
|
if ( display === "none" || display === "" ) {
|
||||||
display = "block";
|
display = "block";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Store the correct default display
|
||||||
elemdisplay[ nodeName ] = display;
|
elemdisplay[ nodeName ] = display;
|
||||||
|
|
||||||
|
// Restore stylesheets
|
||||||
|
jQuery.each( stylesheets, function( idx, obj ) {
|
||||||
|
this.disabled = disabled[ idx ];
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return elemdisplay[ nodeName ];
|
return elemdisplay[ nodeName ];
|
||||||
|
|
|
@ -109,3 +109,6 @@ div#show-tests * { display: none; }
|
||||||
#nothiddendiv { font-size: 16px; }
|
#nothiddendiv { font-size: 16px; }
|
||||||
#nothiddendivchild.em { font-size: 2em; }
|
#nothiddendivchild.em { font-size: 2em; }
|
||||||
#nothiddendivchild.prct { font-size: 150%; }
|
#nothiddendivchild.prct { font-size: 150%; }
|
||||||
|
|
||||||
|
/* 8099 changes to default styles are read correctly */
|
||||||
|
tt { display: none; }
|
||||||
|
|
12
test/unit/effects.js
vendored
12
test/unit/effects.js
vendored
|
@ -169,6 +169,18 @@ test("Persist correct display value", function() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("show() resolves correct default display #8099", function() {
|
||||||
|
expect(3);
|
||||||
|
var bug8099 = jQuery("<tt/>").appendTo("#main");
|
||||||
|
|
||||||
|
equals( bug8099.css("display"), "none", "default display override for all tt" );
|
||||||
|
equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
|
||||||
|
|
||||||
|
bug8099.remove();
|
||||||
|
|
||||||
|
equals( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
|
||||||
|
});
|
||||||
|
|
||||||
test("animate(Hash, Object, Function)", function() {
|
test("animate(Hash, Object, Function)", function() {
|
||||||
expect(1);
|
expect(1);
|
||||||
stop();
|
stop();
|
||||||
|
|
Loading…
Reference in a new issue