diff options
| author | rwldrn <waldron.rick@gmail.com> | 2011-04-12 13:47:27 -0400 |
|---|---|---|
| committer | rwldrn <waldron.rick@gmail.com> | 2011-04-12 13:50:15 -0400 |
| commit | 885b64d4e683bce475a4ec8495cbba80b6b2e1b3 (patch) | |
| tree | da3c5d9865cb90ddfeebb3da59b6d2422f053d71 | |
| parent | 7164615f6727c67da612fecc63867d30e1b4b4a3 (diff) | |
| download | jquery-885b64d4e683bce475a4ec8495cbba80b6b2e1b3.tar.gz jquery-885b64d4e683bce475a4ec8495cbba80b6b2e1b3.zip | |
Fixes #8099 using iframe to capture an element's real default display; suggested by lrbabe/louisremi
| -rw-r--r-- | src/effects.js | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/src/effects.js b/src/effects.js index 73ce33a86..e7987d210 100644 --- a/src/effects.js +++ b/src/effects.js @@ -548,45 +548,49 @@ if ( jQuery.expr && jQuery.expr.filters ) { } function defaultDisplay( nodeName ) { - var stylesheets = document.styleSheets, - disabled = [], - elem, display, style, idx; + var iframe, iframeDoc, iframeNode, 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 - for ( idx = 0; idx < stylesheets.length; ++idx ) { - style = stylesheets[ idx ]; - disabled[ idx ] = style.disabled; - style.disabled = true; + iframe = defaultDisplay.iframe.clone()[ 0 ]; + + iframe.style.display = "none"; + + document.body.appendChild( iframe ); + + iframeDoc = iframe.contentWindow && iframe.contentWindow || + iframe.contentDocument.document && iframe.contentDocument.document || + iframe.contentDocument; + + iframeNode = jQuery( "<" + nodeName + ">" ).appendTo( jQuery( "body", iframeDoc.document ) ); + + if ( !iframeNode.length ) { + // this will only occur in IE + iframeDoc.document.open(); + iframeDoc.document.write("<!doctype html><html><body></body></html>"); + elem = iframeDoc.document.createElement( nodeName ); + iframeDoc.document.body.appendChild( elem ); + iframeDoc.document.close(); + + iframeNode = jQuery( elem ); } - - // 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(); + + // firefox returns undefined from css("display") + display = iframeNode.css("display") || iframeNode[ 0 ].style.display; 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 ]; - } + iframe.parentNode.removeChild( iframe ); } return elemdisplay[ nodeName ]; } +defaultDisplay.iframe = jQuery("<iframe/>"); + })( jQuery ); |