library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2025-01-10 18:24:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #12018, readyState "interactive" in oldIE lies! Closes gh-848.

Browse Source
This commit is contained in:
Mike Sherov 2012-07-06 10:12:20 -04:00 committed by Dave Methvin
parent aaf134bb70
commit f5fd41252e
7 changed files with 77 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core.js
View File

@ -63,12 +63,13 @@ var
DOMContentLoaded = function() { DOMContentLoaded = function() {
if ( document.addEventListener ) { if ( document.addEventListener ) {
document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
} else { jQuery.ready();
// we're here because readyState !== "loading" in oldIE } else if ( document.readyState === "complete" ) {
// we're here because readyState === "complete" in oldIE
// which is good enough for us to call the dom ready! // which is good enough for us to call the dom ready!
document.detachEvent( "onreadystatechange", DOMContentLoaded ); document.detachEvent( "onreadystatechange", DOMContentLoaded );
}
jQuery.ready(); jQuery.ready();
}
}, },
// [[Class]] -> type pairs // [[Class]] -> type pairs
@ -818,7 +819,7 @@ jQuery.ready.promise = function( obj ) {
// Catch cases where $(document).ready() is called after the // Catch cases where $(document).ready() is called after the
// browser event has already occurred. // browser event has already occurred.
if ( document.readyState !== "loading" ) { if ( document.readyState === "complete" || ( document.readyState !== "loading" && document.addEventListener ) ) {
// Handle it asynchronously to allow scripts the opportunity to delay ready // Handle it asynchronously to allow scripts the opportunity to delay ready
setTimeout( jQuery.ready, 1 ); setTimeout( jQuery.ready, 1 );

19
test/data/event/asyncReady.html
View File

@ -4,27 +4,26 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Test case for jQuery ticket #10067</title> <title>Test case for jQuery ticket #10067</title>
<script type="text/javascript"> <script type="text/javascript">
if ( document.attachEvent ) { setTimeout(function() {
// 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 = document.createElement("script");
el.type = "text/javascript"; el.type = "text/javascript";
el.onload = function() { el.onload = function() {
jQuery( document ).ready(function() { jQuery( document ).ready(function() {
jQuery("body").append("<div>modifying DOM</div>"); window.parent.iframeCallback( jQuery('#container').length === 1 );
window.parent.iframeCallback( true );
}); });
} }
document.getElementsByTagName("head")[ 0 ].appendChild( el ); document.getElementsByTagName("head")[ 0 ].appendChild( el );
el.src = "../../../dist/jquery.js"; el.src = "../../../dist/jquery.js";
}, 1000 ); }, 1000 );
}
</script> </script>
</head> </head>
<body> <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 --> <!-- long loading iframe -->
<iframe src="longLoad.php?sleep=15&return=false" style="width: 1px; height: 1px"></iframe> <iframe src="longLoad.php?sleep=15&return=false" style="width: 1px; height: 1px"></iframe>
</body> </body>

4
test/data/event/longLoadScript.php Normal file
View File

@ -0,0 +1,4 @@
<?php
sleep((int)$_GET['sleep']);
header('Content-type: text/javascript');
?>

2
test/data/event/promiseReady.html
View File

@ -12,6 +12,6 @@ jQuery.when( jQuery.ready ).done(function() {
</script> </script>
</head> </head>
<body> <body>
<!-- long loading iframe --> <!-- empty body -->
</body> </body>
</html> </html>

13
test/data/event/syncReady.html
View File

@ -6,13 +6,18 @@
<script type="text/javascript" src="../../../dist/jquery.js"></script> <script type="text/javascript" src="../../../dist/jquery.js"></script>
</head> </head>
<body> <body>
<script type="text/javascript"> <script type="text/javascript">
jQuery( document ).ready(function () { jQuery( document ).ready(function () {
jQuery("body").append("<div>modifying DOM</div>"); window.parent.iframeCallback( jQuery('#container').length === 1 );
window.parent.iframeCallback( true );
}); });
</script> </script>
<!-- long loading iframe -->
<iframe src="longLoad.php?sleep=10&return=false" style="width: 1px; height: 1px"></iframe> <!-- 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>
</body> </body>
</html> </html>

26
test/data/event/syncReadyLongLoad.html Normal file
View File

@ -0,0 +1,26 @@
<!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>

10
test/unit/event.js
View File

@ -2884,7 +2884,9 @@ if ( hasPHP ) {
ok( isOk, "$.when( $.ready ) works" ); ok( isOk, "$.when( $.ready ) works" );
}); });
testIframeWithCallback( "jQuery.ready synchronous load with long loading iframe", "event/syncReady", function( isOk ) { // oldIE needs all subresources to be loaded before it can gaurantee the document is truly ready to be interacted with
if( document.addEventListener ) {
testIframeWithCallback( "jQuery.ready synchronous load with long loading iframe", "event/syncReadyLongLoad", function( isOk ) {
expect(1); expect(1);
ok( isOk, "jQuery loaded synchronously fires ready before all sub-resources are loaded" ); ok( isOk, "jQuery loaded synchronously fires ready before all sub-resources are loaded" );
}); });
@ -2893,6 +2895,12 @@ if ( hasPHP ) {
expect(1); expect(1);
ok( isOk, "jQuery loaded asynchronously fires ready before all sub-resources are loaded" ); ok( isOk, "jQuery loaded asynchronously fires ready before all sub-resources are loaded" );
}); });
}
testIframeWithCallback( "jQuery.ready synchronous load with long loading subresources", "event/syncReady", function( isOk ) {
expect(1);
ok( isOk, "jQuery loaded synchronously fires ready when the DOM can truly be interacted with" );
});
} }
(function(){ (function(){