Revert "Core: remove custom ready event"

This reverts commit b35bea14a9b1ff6b9ba96e0c51e21bfeecfc4c4a.

diff --git a/src/core/ready.js b/src/core/ready.js
index 046f3abb1c27e0210c548e126ee4e624d2efe3d3..2371eba3af973940887e5cd3cb56fefb5587a725 100644 (file)
--- a/src/core/ready.js
+++ b/src/core/ready.js
@@ -1,6 +1,7 @@
 define( [
        "../core",
        "../var/document",
+       "../core/init",
        "../deferred"
 ], function( jQuery, document ) {
 
@@ -51,6 +52,12 @@ jQuery.extend( {
 
                // If there are functions bound, to execute
                readyList.resolveWith( document, [ jQuery ] );
+
+               // Trigger any bound ready events
+               if ( jQuery.fn.triggerHandler ) {
+                       jQuery( document ).triggerHandler( "ready" );
+                       jQuery( document ).off( "ready" );
+               }
        }
 } );
 

diff --git a/test/unit/ready.js b/test/unit/ready.js
index 6272dbdd403304f5dd17f3e523c3a4607bc4060c..079c344eaa2e5a1c673249a64768b73fb894bd5d 100644 (file)
--- a/test/unit/ready.js
+++ b/test/unit/ready.js
@@ -1,6 +1,6 @@
 QUnit.module( "ready" );
 
-( function() {
+(function(){
        var notYetReady, noEarlyExecution,
                order = [],
                args = {};
@@ -16,7 +16,6 @@ QUnit.module( "ready" );
 
        // Create an event handler.
        function makeHandler( testId ) {
-
                // When returned function is executed, push testId onto `order` array
                // to ensure execution order. Also, store event handler arg to ensure
                // the correct arg is being passed into the event handler.
@@ -27,44 +26,48 @@ QUnit.module( "ready" );
        }
 
        // Bind to the ready event in every possible way.
-       jQuery( makeHandler( "a" ) );
-       jQuery( document ).ready( makeHandler( "b" ) );
+       jQuery(makeHandler("a"));
+       jQuery(document).ready(makeHandler("b"));
+       jQuery(document).on("ready.readytest", makeHandler("c"));
 
        // Do it twice, just to be sure.
-       jQuery( makeHandler( "c" ) );
-       jQuery( document ).ready( makeHandler( "d" ) );
+       jQuery(makeHandler("d"));
+       jQuery(document).ready(makeHandler("e"));
+       jQuery(document).on("ready.readytest", makeHandler("f"));
 
        noEarlyExecution = order.length === 0;
 
        // This assumes that QUnit tests are run on DOM ready!
-       QUnit.test( "jQuery ready", function( assert ) {
-               assert.expect( 8 );
+       QUnit.test("jQuery ready", function( assert ) {
+               expect(10);
 
-               assert.ok( noEarlyExecution,
-                       "Handlers bound to DOM ready should not execute before DOM ready" );
+               ok(noEarlyExecution, "Handlers bound to DOM ready should not execute before DOM ready");
 
                // Ensure execution order.
-               assert.deepEqual( order, [ "a", "b", "c", "d" ],
-                       "Bound DOM ready handlers should execute in on-order" );
+               deepEqual(order, ["a", "b", "d", "e", "c", "f"], "Bound DOM ready handlers should execute in on-order, but those bound with jQuery(document).on( 'ready', fn ) will always execute last");
 
                // Ensure handler argument is correct.
-               assert.equal( args.a, jQuery,
-                       "Argument passed to fn in jQuery( fn ) should be jQuery" );
-               assert.equal( args.b, jQuery,
-                       "Argument passed to fn in jQuery(document).ready( fn ) should be jQuery" );
+               equal(args["a"], jQuery, "Argument passed to fn in jQuery( fn ) should be jQuery");
+               equal(args["b"], jQuery, "Argument passed to fn in jQuery(document).ready( fn ) should be jQuery");
+               ok(args["c"] instanceof jQuery.Event, "Argument passed to fn in jQuery(document).on( 'ready', fn ) should be an event object");
 
                order = [];
 
                // Now that the ready event has fired, again bind to the ready event
                // in every possible way. These event handlers should execute immediately.
-               jQuery( makeHandler( "g" ) );
-               assert.equal( order.pop(), "g", "Event handler should execute immediately" );
-               assert.equal( args.g, jQuery, "Argument passed to fn in jQuery( fn ) should be jQuery" );
-
-               jQuery( document ).ready( makeHandler( "h" ) );
-               assert.equal( order.pop(), "h", "Event handler should execute immediately" );
-               assert.equal( args.h, jQuery,
-                       "Argument passed to fn in jQuery(document).ready( fn ) should be jQuery" );
-       } );
+               jQuery(makeHandler("g"));
+               equal(order.pop(), "g", "Event handler should execute immediately");
+               equal(args["g"], jQuery, "Argument passed to fn in jQuery( fn ) should be jQuery");
+
+               jQuery(document).ready(makeHandler("h"));
+               equal(order.pop(), "h", "Event handler should execute immediately");
+               equal(args["h"], jQuery, "Argument passed to fn in jQuery(document).ready( fn ) should be jQuery");
+
+               jQuery(document).on("ready.readytest", makeHandler("never"));
+               equal(order.length, 0, "Event handler should never execute since DOM ready has already passed");
+
+               // Cleanup.
+               jQuery(document).off("ready.readytest");
+       });
 
 } )();