Use window.QUnit to detect the top window when loading with AMD

9f433d9f · Timmy Willison · b718a169 · 9f433d9f
Commit 9f433d9f authored Aug 27, 2013 by Timmy Willison
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

jquery.js test/jquery.js +3 -1

No files found.
--- a/test/jquery.js
+++ b/test/jquery.js
@@ -26,7 +26,9 @@
 		label: "Load with AMD",
 		tooltip: "Load the AMD jQuery file (and its dependencies)"
 	});
-	if ( QUnit.urlParams.amd && parent == window ) {
+	// If QUnit is on window, this is the main window
+	// This detection allows AMD tests to be run in an iframe
+	if ( QUnit.urlParams.amd && window.QUnit ) {
 		require.config({ baseUrl: src });
 		src = "src/jquery";
 		// Include tests if specified