Ticket #8099 Updates per review

Karunakar · Apr 13, 2011 · 59240d3 · 59240d3
1 parent 4fde550
commit 59240d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git 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
@@ -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();
 
 });