Ticket 8099, Reattempt with iframe

1 files changed, 28 insertions, 3 deletions

diff --git a/src/effects.js b/src/effects.js
index 7aec83009..73ce33a86 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -548,17 +548,42 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 }
 
 function defaultDisplay( nodeName ) {
+	var stylesheets = document.styleSheets,
+			disabled = [],
+			elem, display, style, idx;
+
 	if ( !elemdisplay[ nodeName ] ) {
-		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
-			display = elem.css("display");
 
+		// #8099 - If the end-dev has globally changed a default
+		// display, we can temporarily disable their styles to check
+		// for the correct default value
+		for ( idx = 0; idx < stylesheets.length; ++idx  ) {
+			style = stylesheets[ idx ];
+			disabled[ idx ] = style.disabled;
+			style.disabled = true;
+		}
+		
+		// To accurately check an element's default display value, 
+		// create a temp element and check it's default display, this
+		// will ensure that the value returned is not a user-tampered
+		// value.
+		elem = jQuery("<" + nodeName + ">").appendTo("body"),
+		display = elem.css("display");
+		
+		// Remove temp element
 		elem.remove();
 
 		if ( display === "none" || display === "" ) {
 			display = "block";
 		}
-
+		
+		// Store the correct default display
 		elemdisplay[ nodeName ] = display;
+
+		// Restore stylesheets
+		for ( idx = 0; idx < stylesheets.length; ++idx  ) {
+			stylesheets[ idx ].disabled = disabled[ idx ];
+		}
 	}
 
 	return elemdisplay[ nodeName ];