aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Sherov <mike.sherov@gmail.com>2012-08-23 17:46:12 -0400
committerDave Methvin <dave.methvin@gmail.com>2012-08-23 20:28:22 -0400
commita9c2a9bf61af4c09e8f089b45e8986b9a5416d46 (patch)
tree344891592c10508eebc2265335c00fd61c08a143
parent10901f7d9fa6be01cc6b88cd94d279760b42a069 (diff)
downloadjquery-a9c2a9bf61af4c09e8f089b45e8986b9a5416d46.tar.gz
jquery-a9c2a9bf61af4c09e8f089b45e8986b9a5416d46.zip
Scorch the earth and retreat on readyState interactive! Close gh-907.
Diffstat
-rw-r--r--src/core.js4
-rw-r--r--test/data/event/asyncReady.html30
-rw-r--r--test/data/event/longLoad.php6
-rw-r--r--test/data/event/partialLoadReady.php40
-rw-r--r--test/data/event/syncReadyLongLoad.html26
-rw-r--r--test/unit/event.js44
6 files changed, 13 insertions, 137 deletions
diff --git a/src/core.js b/src/core.js
index 4652c5ad7..916e7ad8d 100644
--- a/src/core.js
+++ b/src/core.js
@@ -831,9 +831,9 @@ jQuery.ready.promise = function( obj ) {
readyList = jQuery.Deferred();
// Catch cases where $(document).ready() is called after the browser event has already occurred.
- // IE10 and lower don't handle "interactive" properly... use a weak inference to detect it
+ // we once tried to use readyState "interactive" here, but it caused issues like the one
// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
- if ( document.attachEvent ? document.readyState === "complete" : document.readyState !== "loading" ) {
+ if ( document.readyState === "complete" ) {
// Handle it asynchronously to allow scripts the opportunity to delay ready
setTimeout( jQuery.ready, 1 );
diff --git a/test/data/event/asyncReady.html b/test/data/event/asyncReady.html
deleted file mode 100644
index 48a967a2a..000000000
--- a/test/data/event/asyncReady.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">
-setTimeout(function() {
- el = document.createElement("script");
- el.type = "text/javascript";
- el.onload = function() {
- jQuery( document ).ready(function() {
- window.parent.iframeCallback( jQuery('#container').length === 1 );
- });
- }
- document.getElementsByTagName("head")[ 0 ].appendChild( el );
- el.src = "../../../dist/jquery.js";
-}, 1000 );
-</script>
-</head>
-<body>
-
-<!-- external resources that come before elements trick
-oldIE into thinking the dom is ready, but it's not... -->
-<script type="text/javascript" src="longLoadScript.php?sleep=1"></script>
-<div id="container" style="height: 300px"></div>
-
-<!-- long loading iframe -->
-<iframe src="longLoad.php?sleep=15&return=false" style="width: 1px; height: 1px"></iframe>
-</body>
-</html>
diff --git a/test/data/event/longLoad.php b/test/data/event/longLoad.php
deleted file mode 100644
index ba1d43f82..000000000
--- a/test/data/event/longLoad.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-sleep((int)$_GET['sleep']);
-?>
-<script type="text/javascript">
-window.parent.parent.iframeCallback(<?php echo $_GET['return'];?>);
-</script> \ No newline at end of file
diff --git a/test/data/event/partialLoadReady.php b/test/data/event/partialLoadReady.php
deleted file mode 100644
index 1a93b0b8a..000000000
--- a/test/data/event/partialLoadReady.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-//try very hard to disable output buffering
-//@ini_set("output_buffering", 0);
-//@apache_setenv("no-gzip", 1);
-//@ini_set("zlib.output_compression", 0);
-ob_start();
-?>
-
-<!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 #12282</title>
-</head>
-<body>
-
-<h1>TEST</h1>
-<script type="text/javascript" src="../../../dist/jquery.js"></script>
-<script type="text/javascript">
-jQuery( document ).ready(function() {
- window.parent.iframeCallback( jQuery('#container').length === 1 );
-});
-</script>
-
-<?php
-//send the top of the document without sending the bottom portion
-echo str_repeat(" ", 1024 * 8), "\n";
-ob_flush();
-?>
-
-<h2>Sleeping for 1 seconds (simulating server side process)</h2>
-
-<?php
-//sleep for a bit, simulating a server side process
-sleep(1);
-?>
-
-<div id="container">ready</h2>
-</body>
-</html> \ No newline at end of file
diff --git a/test/data/event/syncReadyLongLoad.html b/test/data/event/syncReadyLongLoad.html
deleted file mode 100644
index 83f2859ed..000000000
--- a/test/data/event/syncReadyLongLoad.html
+++ /dev/null
@@ -1,26 +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" src="../../../dist/jquery.js"></script>
-</head>
-<body>
-
-<script type="text/javascript">
-jQuery( document ).ready(function () {
- window.parent.iframeCallback( jQuery('#container').length === 1 );
-});
-</script>
-
-<!-- external resources that come before elements trick
- oldIE into thinking the dom is ready, but it's not...
- leaving this check here for future trailblazers to attempt
- fixing this...-->
-<script type="text/javascript" src="longLoadScript.php?sleep=1"></script>
-<div id="container" style="height: 300px"></div>
-
-<!-- long loading iframe -->
-<iframe src="longLoad.php?sleep=10&return=false" style="width: 1px; height: 1px"></iframe>
-</body>
-</html>
diff --git a/test/unit/event.js b/test/unit/event.js
index f58eb59e6..74cf1b9b7 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -2882,39 +2882,17 @@ test("fixHooks extensions", function() {
jQuery.event.fixHooks.click = saved;
});
+testIframeWithCallback( "jQuery.ready promise", "event/promiseReady.html", function( isOk ) {
+ expect(1);
+ ok( isOk, "$.when( $.ready ) works" );
+});
-// async loaded tests expect jQuery to be loaded as a single file
-// if we're not doing PHP concat, then we fall back to document.write
-// which breaks order of execution on async loaded files
-// also need PHP to make the incepted IFRAME hang
+// need PHP here to make the incepted IFRAME hang
if ( hasPHP ) {
- testIframeWithCallback( "jQuery.ready promise", "event/promiseReady.html", function( isOk ) {
- expect(1);
- ok( isOk, "$.when( $.ready ) works" );
- });
-
testIframeWithCallback( "jQuery.ready synchronous load with long loading subresources", "event/syncReady.html", function( isOk ) {
expect(1);
ok( isOk, "jQuery loaded synchronously fires ready when the DOM can truly be interacted with" );
});
-
- testIframeWithCallback( "jQuery.ready synchronous load with partially loaded page", "event/partialLoadReady.php", function( isOk ) {
- expect(1);
- ok( isOk, "jQuery loaded synchronously fires ready when the DOM can truly be interacted with" );
- });
-
- // allIE needs all subresources and full page to be loaded before it can gaurantee the document is truly ready to be interacted with
- if( !document.attachEvent ) {
- testIframeWithCallback( "jQuery.ready synchronous load with long loading iframe", "event/syncReadyLongLoad.html", function( isOk ) {
- expect(1);
- ok( isOk, "jQuery loaded synchronously fires ready before all sub-resources are loaded" );
- });
-
- testIframeWithCallback( "jQuery.ready asynchronous load with long loading iframe", "event/asyncReady.html", function( isOk ) {
- expect(1);
- ok( isOk, "jQuery loaded asynchronously fires ready before all sub-resources are loaded" );
- });
- }
}
(function(){
@@ -2994,22 +2972,22 @@ test("change handler should be detached from element", function() {
expect( 2 );
var $fixture = jQuery( "<input type='text' id='change-ie-leak' />" ).appendTo( "body" );
-
+
var originRemoveEvent = jQuery.removeEvent;
-
+
var wrapperRemoveEvent = function(elem, type, handle){
equal("change", type, "Event handler for 'change' event should be removed");
equal("change-ie-leak", jQuery(elem).attr("id"), "Event handler for 'change' event should be removed from appropriate element");
originRemoveEvent(elem, type, handle);
};
-
+
jQuery.removeEvent = wrapperRemoveEvent ;
-
+
$fixture.bind( "change", function( event ) {});
$fixture.unbind( "change" );
-
+
$fixture.remove();
-
+
jQuery.removeEvent = originRemoveEvent;
});
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-04 04:33:12 +0000