Skip to content
Permalink
Browse files

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

  • Loading branch information
jeresig committed Feb 14, 2011
2 parents 3ad8dd2 + c67867a commit bb9408516aa0fc8892f4e07a99b1a47bce06081b
Showing with 43 additions and 3 deletions.
  1. +28 −3 src/effects.js
  2. +3 −0 test/data/testsuite.css
  3. +12 −0 test/unit/effects.js
@@ -505,17 +505,42 @@ if ( jQuery.expr && jQuery.expr.filters ) {
}

function defaultDisplay( nodeName ) {
var stylesheets = document.styleSheets,
disabled = [],
elem, display, style, idx;

if ( !elemdisplay[ nodeName ] ) {
var elem = jQuery("<" + nodeName + ">").appendTo("body"),
display = elem.css("display");

// #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");

// Remove temp element
elem.remove();

if ( display === "none" || display === "" ) {
display = "block";
}


// Store the correct default display
elemdisplay[ nodeName ] = display;

// Restore stylesheets
for ( idx = 0; idx < stylesheets.length; ++idx ) {
stylesheets[ idx ].disabled = disabled[ idx ];
}
}

return elemdisplay[ nodeName ];
@@ -109,3 +109,6 @@ div#show-tests * { display: none; }
#nothiddendiv { font-size: 16px; }
#nothiddendivchild.em { font-size: 2em; }
#nothiddendivchild.prct { font-size: 150%; }

/* 8099 changes to default styles are read correctly */
tt { display: none; }
@@ -162,6 +162,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() {
expect(1);
stop();

0 comments on commit bb94085

Please sign in to comment.
You can’t perform that action at this time.