]> source.dussan.org Git - jquery.git/commitdiff
Fixes #8099 using iframe to capture an element's real default display; suggested...
authorrwldrn <waldron.rick@gmail.com>
Tue, 12 Apr 2011 21:27:45 +0000 (17:27 -0400)
committerrwldrn <waldron.rick@gmail.com>
Tue, 12 Apr 2011 22:57:14 +0000 (18:57 -0400)
src/effects.js

index e7987d2103e922a809ccf6c6640716725dce931a..bdd0715efd3858d903706f1aa07beab37ba6ddda 100644 (file)
@@ -548,35 +548,24 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 }
 
 function defaultDisplay( nodeName ) {
-       var iframe, iframeDoc, iframeNode, display;
 
        if ( !elemdisplay[ nodeName ] ) {
 
-               iframe = defaultDisplay.iframe.clone()[ 0 ];
+               var iframe, iframeDoc, iframeNode, display, elem;
 
-               iframe.style.display = "none";
+               iframe = defaultDisplay.iframe.clone()[ 0 ];
 
                document.body.appendChild( iframe );
 
-               iframeDoc = iframe.contentWindow && iframe.contentWindow || 
-                                                               iframe.contentDocument.document && iframe.contentDocument.document ||
-                                                               iframe.contentDocument;
+               iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
 
-               iframeNode = jQuery( "<" + nodeName + ">" ).appendTo( jQuery( "body", iframeDoc.document ) );
+               iframeDoc.open();
+               iframeDoc.write("<!doctype><html><body></body></html>");
+               elem = iframeDoc.createElement( nodeName );
+               iframeDoc.body.appendChild( elem );
+               iframeDoc.close();
 
-               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 );
-               }
-
-               // firefox returns undefined from css("display")
-               display = iframeNode.css("display") || iframeNode[ 0 ].style.display;
+               display = jQuery( elem ).css( "display" );
 
                if ( display === "none" || display === "" ) {
                        display = "block";
@@ -591,6 +580,12 @@ function defaultDisplay( nodeName ) {
        return elemdisplay[ nodeName ];
 }
 
-defaultDisplay.iframe = jQuery("<iframe/>");
+defaultDisplay.iframe = jQuery("<iframe/>", {
+       css: {
+               width: 0,
+               height: 0, 
+               border: 0
+       }
+});
 
 })( jQuery );