Land Rich's fix for not using window.top to do frame detection. Fixes #…

…4787.
jquery · Nov 11, 2009 · bf71575 · bf71575
1 parent c4c820e
commit bf71575
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/event.js b/src/event.js
@@ -849,10 +849,15 @@ function bindReady() {
 			}
 		});
 
-		// If IE and not an iframe
+		// If IE and not a frame
 		// continually check to see if the document is ready
-		// NOTE: DO NOT CHANGE TO ===, FAILS IN IE.
-		if ( document.documentElement.doScroll && window == window.top ) (function() {
+		var toplevel = false;
+
+		try {
+			toplevel = window.frameElement === undefined;
+		} catch(e){}
+
+		if ( document.documentElement.doScroll && toplevel ) (function() {
 			if ( jQuery.isReady ) {
 				return;
 			}