]> 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: 4fde550)
Ticket #8099 Updates per review
authorrwldrn <waldron.rick@gmail.com>
Wed, 13 Apr 2011 17:58:17 +0000 (13:58 -0400)
committerrwldrn <waldron.rick@gmail.com>
Wed, 13 Apr 2011 17:58:17 +0000 (13:58 -0400)
src/effects.js patch | blob | history
test/unit/effects.js patch | blob | history

diff --git a/src/effects.js b/src/effects.js
index 828798cb5a8420ee5a86d69498da396bff65ee7b..460811cd960d4deacbb9a1af701f3c956b07ab58 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -1,6 +1,8 @@
 (function( jQuery ) {
 
 var elemdisplay = {},
+       iframe = null, 
+       iframeDoc = null,
        rfxtypes = /^(?:toggle|show|hide)$/,
        rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
        timerId,
@@ -558,11 +560,8 @@ function defaultDisplay( nodeName ) {
 
                if ( display === "none" || display === "" ) {
 
-                       var iframe = defaultDisplay.iframe,
-                                       iframeDoc = defaultDisplay.iframeDoc;
-
                        // No iframe to use yet, so create it
-                       if ( !defaultDisplay.iframe ) {
+                       if ( !iframe ) {
 
                                iframe = document.createElement( "iframe" );
                                iframe.width = iframe.height = 0;
@@ -572,9 +571,6 @@ function defaultDisplay( nodeName ) {
                                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
@@ -598,9 +594,6 @@ function defaultDisplay( nodeName ) {
        return elemdisplay[ nodeName ];
 }
 
-defaultDisplay.iframe = null;
-defaultDisplay.iframeDoc = null;
-
 
 
 })( jQuery );
diff --git a/test/unit/effects.js b/test/unit/effects.js
index f3ccd218c9a394887cb3513ecd7850ef07b92ee5..082128876b90bcbe0f47775398492d3faa06248b 100644 (file)
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -163,8 +163,9 @@ test("Persist correct display value", function() {
 });
 
 test("show() resolves correct default display #8099", function() {
-       expect(5);
-       var bug8099 = jQuery("<tt/>").appendTo("#main");
+       expect(7);
+       var bug8099 = jQuery("<tt/>").appendTo("#main"), 
+                       div8099 = jQuery("<div/>", { className: "hidden" }).appendTo("#main");
 
        equals( bug8099.css("display"), "none", "default display override for all tt" );
        equals( bug8099.show().css("display"), "inline", "Correctly resolves display:inline" );
@@ -174,7 +175,11 @@ test("show() resolves correct default display #8099", function() {
        equals( bug8099.hide().css("display"), "none", "default display override for all tt" );
        equals( bug8099.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" );
+
        bug8099.remove();
+       div8099.remove();
 
 });
 
jQuery JavaScript Library: https://github.com/jquery/jquery