Core: Do not run window.onready when ready

Fixes #14802
jquery · Mar 5, 2014 · 2df1aad · 2df1aad
1 parent f4b37d8
commit 2df1aad
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/src/core/ready.js b/src/core/ready.js
@@ -51,8 +51,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
@@ -0,0 +1,24 @@
+<!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>
diff --git a/test/unit/core.js b/test/unit/core.js
@@ -1516,3 +1516,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" );
+	}
+);