Skip to content

J
jquery
Commit 2df1aad6 authored by Dave Methvin's avatar Dave Methvin
Browse files
Options

Core: Do not run window.onready when ready 

Fixes #14802
parent f4b37d89
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 2 deletions
src/core/ready.js
View file @ 2df1aad6
...@@ -51,8 +51,9 @@ jQuery.extend({ ...@@ -51,8 +51,9 @@ jQuery.extend({
readyList.resolveWith( document, [ jQuery ] ); readyList.resolveWith( document, [ jQuery ] );
// Trigger any bound ready events // Trigger any bound ready events
if ( jQuery.fn.trigger ) { if ( jQuery.fn.triggerHandler ) {
jQuery( document ).trigger("ready").off("ready"); jQuery( document ).triggerHandler( "ready" );
jQuery( document ).off( "ready" );
} }
} }
}); });
......
test/data/core/onready.html 0 → 100644
View file @ 2df1aad6
<!doctype html>
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
<title>alias-masked DOM properties (#14074)</title>
<script>
var error = false;
window.onready = function() { error = "Called window.onready"; };
</script>
<script src="../../jquery.js"></script>
</head>
<body>
<form>
<input type="text" id="nodeName"/>
</form>
<script>
jQuery(function() {
setTimeout( function() {
window.parent.iframeCallback( error );
});
});
</script>
</body>
</html>
\ No newline at end of file
test/unit/core.js
View file @ 2df1aad6
...@@ -1516,3 +1516,10 @@ testIframeWithCallback( "Tolerating alias-masked DOM properties (#14074)", "core ...@@ -1516,3 +1516,10 @@ testIframeWithCallback( "Tolerating alias-masked DOM properties (#14074)", "core
deepEqual( errors, [], "jQuery loaded" ); deepEqual( errors, [], "jQuery loaded" );
} }
); );
testIframeWithCallback( "Don't call window.onready (#14802)", "core/onready.html",
function( error ) {
expect( 1 );
equal( error, false, "no call to user-defined onready" );
}
);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment