deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Merge branch '8099' of https://github.com/rwldrn/jquery into rwldrn-8099"

Browse source 
This reverts commit bb9408516a, reversing
changes made to 3ad8dd242a.

Conflicts:

	src/effects.js
This commit is contained in:
Anton M 2011-02-15 22:30:34 +01:00
parent 6b08d88d04
commit faa6fe32f7
3 changed files with 2 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/effects.js vendored
View file

@ -505,42 +505,17 @@ if ( jQuery.expr && jQuery.expr.filters ) {
} }
function defaultDisplay( nodeName ) { function defaultDisplay( nodeName ) {
var stylesheets = document.styleSheets,
disabled = [],
elem, display, style, idx;
if ( !elemdisplay[ nodeName ] ) { if ( !elemdisplay[ nodeName ] ) {
var elem = jQuery("<" + nodeName + ">").appendTo("body"),
// #8099 - If the end-dev has globally changed a default
// display, we can temporarily disable their styles to check
// for the correct default value
for ( idx = 0; idx < stylesheets.length; ++idx ) {
style = stylesheets[ idx ];
disabled[ idx ] = style.disabled;
style.disabled = true;
}
// To accurately check an element's default display value,
// create a temp element and check it's default display, this
// will ensure that the value returned is not a user-tampered
// value.
elem = jQuery("<" + nodeName + ">").appendTo("body");
display = elem.css("display"); 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
for ( idx = 0; idx < stylesheets.length; ++idx ) {
stylesheets[ idx ].disabled = disabled[ idx ];
}
} }
return elemdisplay[ nodeName ]; return elemdisplay[ nodeName ];

3
test/data/testsuite.css
View file

@ -109,6 +109,3 @@ 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
View file

@ -162,18 +162,6 @@ 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();