Ticket #8099 Conditional iframe approache, caches both iframe and iframedoc for reuse
This commit is contained in:
parent
81de96af74
commit
4fde550cb6
2 changed files with 45 additions and 26 deletions
63
src/effects.js
vendored
63
src/effects.js
vendored
|
@ -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 ];
|
||||
|
||||
document.body.appendChild( iframe );
|
||||
|
||||
iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
|
||||
|
||||
iframeDoc.open();
|
||||
iframeDoc.write("<!doctype><html><body></body></html>");
|
||||
elem = iframeDoc.createElement( nodeName );
|
||||
iframeDoc.body.appendChild( elem );
|
||||
iframeDoc.close();
|
||||
|
||||
display = jQuery( elem ).css( "display" );
|
||||
elem.remove();
|
||||
|
||||
if ( display === "none" || display === "" ) {
|
||||
display = "block";
|
||||
|
||||
var iframe = defaultDisplay.iframe,
|
||||
iframeDoc = defaultDisplay.iframeDoc;
|
||||
|
||||
// No iframe to use yet, so create it
|
||||
if ( !defaultDisplay.iframe ) {
|
||||
|
||||
iframe = document.createElement( "iframe" );
|
||||
iframe.width = iframe.height = 0;
|
||||
|
||||
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 );
|
||||
|
|
8
test/unit/effects.js
vendored
8
test/unit/effects.js
vendored
|
@ -163,15 +163,19 @@ test("Persist correct display value", function() {
|
|||
});
|
||||
|
||||
test("show() resolves correct default display #8099", function() {
|
||||
expect(3);
|
||||
expect(5);
|
||||
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" );
|
||||
|
||||
equals( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
|
||||
|
||||
equals( bug8099.hide().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" );
|
||||
});
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue