Commit b35bea14 authored by Timmy Willison's avatar Timmy Willison

Core: remove custom ready event

Fixes gh-2264
Close gh-2265
parent b5b0d727
define([ define([
"../core", "../core",
"../core/init",
"../deferred" "../deferred"
], function( jQuery ) { ], function( jQuery ) {
...@@ -54,12 +53,6 @@ jQuery.extend({ ...@@ -54,12 +53,6 @@ jQuery.extend({
// If there are functions bound, to execute // If there are functions bound, to execute
readyList.resolveWith( document, [ jQuery ] ); readyList.resolveWith( document, [ jQuery ] );
// Trigger any bound ready events
if ( jQuery.fn.triggerHandler ) {
jQuery( document ).triggerHandler( "ready" );
jQuery( document ).off( "ready" );
}
} }
}); });
......
module("event"); module( "event" );
(function(){ (function() {
var notYetReady, noEarlyExecution, var notYetReady, noEarlyExecution,
order = [], order = [],
args = {}; args = {};
notYetReady = !jQuery.isReady; notYetReady = !jQuery.isReady;
test("jQuery.isReady", function() { test( "jQuery.isReady", function() {
expect(2); expect( 2 );
equal(notYetReady, true, "jQuery.isReady should not be true before DOM ready"); equal( notYetReady, true, "jQuery.isReady should not be true before DOM ready" );
equal(jQuery.isReady, true, "jQuery.isReady should be true once DOM is ready"); equal( jQuery.isReady, true, "jQuery.isReady should be true once DOM is ready" );
}); });
// Create an event handler. // Create an event handler.
function makeHandler( testId ) { function makeHandler( testId ) {
// When returned function is executed, push testId onto `order` array // When returned function is executed, push testId onto `order` array
// to ensure execution order. Also, store event handler arg to ensure // to ensure execution order. Also, store event handler arg to ensure
// the correct arg is being passed into the event handler. // the correct arg is being passed into the event handler.
return function( arg ) { return function( arg ) {
order.push(testId); order.push( testId );
args[testId] = arg; args[testId] = arg;
}; };
} }
// Bind to the ready event in every possible way. // Bind to the ready event in every possible way.
jQuery(makeHandler("a")); jQuery( makeHandler( "a" ) );
jQuery(document).ready(makeHandler("b")); jQuery( document ).ready( makeHandler( "b" ) );
jQuery(document).on("ready.readytest", makeHandler("c"));
// Do it twice, just to be sure. // Do it twice, just to be sure.
jQuery(makeHandler("d")); jQuery( makeHandler( "c" ) );
jQuery(document).ready(makeHandler("e")); jQuery( document ).ready( makeHandler( "d" ) );
jQuery(document).on("ready.readytest", makeHandler("f"));
noEarlyExecution = order.length === 0; noEarlyExecution = order.length === 0;
// This assumes that QUnit tests are run on DOM ready! // This assumes that QUnit tests are run on DOM ready!
test("jQuery ready", function() { test( "jQuery ready", function() {
expect(10); expect( 8 );
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. // Ensure execution 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"); deepEqual( order, [ "a", "b", "c", "d" ],
"Bound DOM ready handlers should execute in on-order" );
// Ensure handler argument is correct. // Ensure handler argument is correct.
equal(args["a"], jQuery, "Argument passed to fn in jQuery( fn ) should be jQuery"); equal( args.a, jQuery,
equal(args["b"], jQuery, "Argument passed to fn in jQuery(document).ready( fn ) should be jQuery"); "Argument passed to fn in jQuery( 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"); equal( args.b, jQuery,
"Argument passed to fn in jQuery(document).ready( fn ) should be jQuery" );
order = []; order = [];
// Now that the ready event has fired, again bind to the ready event // Now that the ready event has fired, again bind to the ready event
// in every possible way. These event handlers should execute immediately. // in every possible way. These event handlers should execute immediately.
jQuery(makeHandler("g")); jQuery( makeHandler( "g" ) );
equal(order.pop(), "g", "Event handler should execute immediately"); equal( order.pop(), "g", "Event handler should execute immediately" );
equal(args["g"], jQuery, "Argument passed to fn in jQuery( fn ) should be jQuery"); equal( args.g, jQuery, "Argument passed to fn in jQuery( fn ) should be jQuery" );
jQuery(document).ready(makeHandler("h")); jQuery( document ).ready( makeHandler( "h" ) );
equal(order.pop(), "h", "Event handler should execute immediately"); 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"); 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");
}); });
})(); })();
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