4 files changed, 32 insertions, 64 deletions
diff --git a/test/data/event/asyncQuickReadyFalse.html b/test/data/event/asyncQuickReadyFalse.html
deleted file mode 100644
index 935269749..000000000
--- a/test/data/event/asyncQuickReadyFalse.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<title>Test case for jQuery ticket #10067</title>
-<script type="text/javascript">
-
-// ready should fire callback after the iframe fires the callback
-setTimeout(function () {
-	el = document.createElement('script');
-	el.type = 'text/javascript';
-	el.onload = function () {
-		jQuery.quickReady = false;
-		jQuery(document).ready(function () {
-			// unfortunately, Opera 11.6 and lower has a bug where
-			// document.readyState is "complete" before all subresources
-			// are loaded, so we need this check here for tests to pass
-			if ( document.readyState !== "complete" ) {
-				window.parent.iframeCallback(false);
-			}
-		});
-    }
-	document.getElementsByTagName('head')[0].appendChild(el);
-	el.src = "../include_js.php";
-}, 1000);
-</script>
-</head>
-<body>
-<!-- long loading iframe -->
-<iframe src="longLoad.php?sleep=3&return=true" style="width: 1px; height: 1px"></iframe>
-</body>
-</html>
-\ No newline at end of file
diff --git a/test/data/event/asyncQuickReadyTrue.html b/test/data/event/asyncQuickReadyTrue.html
deleted file mode 100644
index cdcb82128..000000000
--- a/test/data/event/asyncQuickReadyTrue.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<title>Test case for jQuery ticket #10067</title>
-<script type="text/javascript">
-// browsers that implement the non-standard event API will load the iframe
-// before loading up jQuery, so quickReady has no effect here
-if( document.attachEvent ){
-	window.parent.iframeCallback(true);
-} else {
-	setTimeout(function () {
-		el = document.createElement('script');
-		el.type = 'text/javascript';
-		el.onload = function () {
-			jQuery(document).ready(function () {
-				window.parent.iframeCallback(true);
-			});
-	    }
-		document.getElementsByTagName('head')[0].appendChild(el);
-		el.src = "../include_js.php";
-	}, 1000);
-}
-</script>
-</head>
-<body>
-<!-- long loading iframe -->
-<iframe src="longLoad.php?sleep=30&return=false" style="width: 1px; height: 1px"></iframe>
-</body>
-</html>
-\ No newline at end of file
diff --git a/test/data/event/asyncReady.html b/test/data/event/asyncReady.html
new file mode 100644
index 000000000..e32ff9cfb
--- /dev/null
+++ b/test/data/event/asyncReady.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Test case for jQuery ticket #10067</title>
+<script type="text/javascript">
+if ( document.attachEvent ) {
+	// browsers that use the non-standard event API will load the iframe
+	// before jQuery, so there's no way to fire ready before the iframe loads
+	window.parent.iframeCallback( true );
+} else {
+	setTimeout(function() {
+		el = document.createElement("script");
+		el.type = "text/javascript";
+		el.onload = function() {
+			jQuery( document ).ready(function() {
+				window.parent.iframeCallback( true );
+			});
+	    }
+		document.getElementsByTagName("head")[ 0 ].appendChild( el );
+		el.src = "../include_js.php";
+	}, 1000 );
+}
+</script>
+</head>
+<body>
+<!-- long loading iframe -->
+<iframe src="longLoad.php?sleep=15&return=false" style="width: 1px; height: 1px"></iframe>
+</body>
+</html>
+\ No newline at end of file
diff --git a/test/data/event/syncReady.html b/test/data/event/syncReady.html
index b9dbb2280..df66bc623 100644
--- a/test/data/event/syncReady.html
+++ b/test/data/event/syncReady.html
@@ -7,8 +7,8 @@
 </head>
 <body>
 <script type="text/javascript">
-jQuery(document).ready(function () {
-	window.parent.iframeCallback(true);
+jQuery( document ).ready(function () {
+	window.parent.iframeCallback( true );
 });
 </script>
 <!-- long loading iframe -->