]> source.dussan.org Git - jquery.git/commitdiff
projects / jquery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 59240d3)
Ticket #8099 Performance tweaking, credits 322/head
authorrwldrn <waldron.rick@gmail.com>
Wed, 13 Apr 2011 19:43:15 +0000 (15:43 -0400)
committerrwldrn <waldron.rick@gmail.com>
Wed, 13 Apr 2011 19:43:15 +0000 (15:43 -0400)
src/effects.js patch | blob | history
test/data/testsuite.css patch | blob | history
test/unit/effects.js patch | blob | history

diff --git a/src/effects.js b/src/effects.js
index 460811cd960d4deacbb9a1af701f3c956b07ab58..a43d5cb3c28688ba18e46161f93526e15696c3b8 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -556,35 +556,37 @@ function defaultDisplay( nodeName ) {
                var elem = jQuery( "<" + nodeName + ">" ).appendTo( "body" ),
                        display = elem.css( "display" );
 
-               elem.remove();  
+               elem.remove();
 
                if ( display === "none" || display === "" ) {
 
+                       // Get element's real default display by attaching it to a temp iframe
+                       // Conritbutions from Louis Remi and Julian Aurbourg
+                       // based on recommendation by Louis Remi
+                       
                        // No iframe to use yet, so create it
                        if ( !iframe ) {
-
                                iframe = document.createElement( "iframe" );
-                               iframe.width = iframe.height = 0;
+                               iframe.frameBorder = iframe.width = iframe.height = 0;
+                       }
 
-                               document.body.appendChild( iframe );
+                       document.body.appendChild( iframe );
 
+                       // Create a cacheable copy of the iframe document on first call.
+                       // IE and Opera will allow us to reuse the iframeDoc without re-writing the fake html
+                       // document to it, Webkit & Firefox won't allow reusing the iframe document
+                       if ( !iframeDoc || !iframe.createElement ) {
                                iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-                               iframeDoc.write("<!doctype><html><body></body></html>");
-
-                       } else {
-
-                               // Reuse previous iframe
-                               document.body.appendChild( iframe );
-
+                               iframeDoc.write( "<!doctype><html><body></body></html>" );
                        }
 
                        elem = iframeDoc.createElement( nodeName );
 
                        iframeDoc.body.appendChild( elem );
 
-                       display = jQuery( elem ).css( "display" );
+                       display = jQuery.css( elem, "display" );
 
-                       iframe.parentNode.removeChild( iframe );
+                       document.body.removeChild( iframe );
                }
 
                // Store the correct default display
diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index b307d498961b3c126969fdd5a184121d766d51a4..683803e8b9c5570073f8c4c4135e2f25300ae10b 100644 (file)
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -112,3 +112,5 @@ div#show-tests * { display: none; }
 
 /* 8099 changes to default styles are read correctly */
 tt { display: none; }
+sup { display: none; }
+dfn { display: none; }
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 082128876b90bcbe0f47775398492d3faa06248b..8b7cf46798bb16b4b1fb2c030ffe5ff5a47ad604 100644 (file)
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -164,22 +164,22 @@ test("Persist correct display value", function() {
 
 test("show() resolves correct default display #8099", function() {
        expect(7);
-       var bug8099 = jQuery("<tt/>").appendTo("#main"), 
-                       div8099 = jQuery("<div/>", { className: "hidden" }).appendTo("#main");
+       var tt8099 = jQuery("<tt/>").appendTo("body"), 
+                       dfn8099 = jQuery("<dfn/>", { html: "foo"}).appendTo("body");
 
-       equals( bug8099.css("display"), "none", "default display override for all tt" );
-       equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+       equals( tt8099.css("display"), "none", "default display override for all tt" );
+       equals( tt8099.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" );
+       equals( tt8099.hide().css("display"), "none", "default display override for all tt" );
+       equals( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
 
-       equals( div8099.show().css("display"), "block", "default display override for all div.hidden" );
-       equals( div8099.hide().css("display"), "none", "Correctly resolves display:none" );
+       equals( dfn8099.css("display"), "none", "default display override for all dfn" );
+       equals( dfn8099.show().css("display"), "inline", "Correctly resolves display:inline" );
 
-       bug8099.remove();
-       div8099.remove();
+       tt8099.remove();
+       dfn8099.remove();
 
 });
 
jQuery JavaScript Library: https://github.com/jquery/jquery