From 80e3dfa6bac3340aafcc87e956e1c461ba570e68 Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Mon, 3 Mar 2014 22:04:23 -0500 Subject: [PATCH] Core: Do not run window.onready when ready Fixes #14802 (cherry picked from commit 2df1aad6a1c9376c2a477eba26ee992113ed1c23) --- src/core/ready.js | 5 +++-- test/data/core/onready.html | 24 ++++++++++++++++++++++++ test/unit/core.js | 7 +++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 test/data/core/onready.html diff --git a/src/core/ready.js b/src/core/ready.js index 3d0510e38..392c4849f 100644 --- a/src/core/ready.js +++ b/src/core/ready.js @@ -56,8 +56,9 @@ jQuery.extend({ readyList.resolveWith( document, [ jQuery ] ); // Trigger any bound ready events - if ( jQuery.fn.trigger ) { - jQuery( document ).trigger("ready").off("ready"); + if ( jQuery.fn.triggerHandler ) { + jQuery( document ).triggerHandler( "ready" ); + jQuery( document ).off( "ready" ); } } }); diff --git a/test/data/core/onready.html b/test/data/core/onready.html new file mode 100644 index 000000000..1e8f127e7 --- /dev/null +++ b/test/data/core/onready.html @@ -0,0 +1,24 @@ + + + + + alias-masked DOM properties (#14074) + + + + +
+ +
+ + + \ No newline at end of file diff --git a/test/unit/core.js b/test/unit/core.js index 02ad0f221..c59acb84c 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -1492,3 +1492,10 @@ testIframeWithCallback( "Tolerating alias-masked DOM properties (#14074)", "core 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" ); + } +);