diff options
| author | rwldrn <waldron.rick@gmail.com> | 2011-04-13 13:43:52 -0400 |
|---|---|---|
| committer | rwldrn <waldron.rick@gmail.com> | 2011-04-13 13:43:52 -0400 |
| commit | 4fde550cb62219d7edd14653888608fbbf39c22a (patch) | |
| tree | 77357545f668795d9e356619e3e84ea1a72c393f /src/effects.js | |
| parent | 81de96af740f8d397585d8a6fc2a3765dfd16d49 (diff) | |
| download | jquery-4fde550cb62219d7edd14653888608fbbf39c22a.tar.gz jquery-4fde550cb62219d7edd14653888608fbbf39c22a.zip | |
Ticket #8099 Conditional iframe approache, caches both iframe and iframedoc for reuse
Diffstat (limited to 'src/effects.js')
| -rw-r--r-- | src/effects.js | 57 |
1 files changed, 36 insertions, 21 deletions
diff --git a/src/effects.js b/src/effects.js index bdd0715ef..828798cb5 100644 --- a/src/effects.js +++ b/src/effects.js @@ -551,41 +551,56 @@ function defaultDisplay( nodeName ) { if ( !elemdisplay[ nodeName ] ) { - var iframe, iframeDoc, iframeNode, display, elem; + var elem = jQuery( "<" + nodeName + ">" ).appendTo( "body" ), + display = elem.css( "display" ); - iframe = defaultDisplay.iframe.clone()[ 0 ]; + elem.remove(); - document.body.appendChild( iframe ); + if ( display === "none" || display === "" ) { - iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document; + var iframe = defaultDisplay.iframe, + iframeDoc = defaultDisplay.iframeDoc; - iframeDoc.open(); - iframeDoc.write("<!doctype><html><body></body></html>"); - elem = iframeDoc.createElement( nodeName ); - iframeDoc.body.appendChild( elem ); - iframeDoc.close(); + // No iframe to use yet, so create it + if ( !defaultDisplay.iframe ) { - display = jQuery( elem ).css( "display" ); + iframe = document.createElement( "iframe" ); + iframe.width = iframe.height = 0; - if ( display === "none" || display === "" ) { - display = "block"; + document.body.appendChild( iframe ); + + iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document; + iframeDoc.write("<!doctype><html><body></body></html>"); + + // Cache iframe element + defaultDisplay.iframe = iframe; + defaultDisplay.iframeDoc = iframeDoc; + } else { + + // Reuse previous iframe + document.body.appendChild( iframe ); + + } + + elem = iframeDoc.createElement( nodeName ); + + iframeDoc.body.appendChild( elem ); + + display = jQuery( elem ).css( "display" ); + + iframe.parentNode.removeChild( iframe ); } // Store the correct default display elemdisplay[ nodeName ] = display; - - iframe.parentNode.removeChild( iframe ); } return elemdisplay[ nodeName ]; } -defaultDisplay.iframe = jQuery("<iframe/>", { - css: { - width: 0, - height: 0, - border: 0 - } -}); +defaultDisplay.iframe = null; +defaultDisplay.iframeDoc = null; + + })( jQuery ); |