Commit 49670c5f authored by Oleg Gaidarenko's avatar Oleg Gaidarenko Committed by Timmy Willison

Don't execute DOM ready tests in AMD mode (they aren't loaded before DOM ready). Close gh-1335.

parent ca4a0075
...@@ -3,13 +3,14 @@ define([ ...@@ -3,13 +3,14 @@ define([
"./var/concat", "./var/concat",
"./var/push", "./var/push",
"./var/deletedIds", "./var/deletedIds",
"./var/strundefined",
"./manipulation/var/rcheckableType", "./manipulation/var/rcheckableType",
"./data/accepts", "./data/accepts",
"./selector", "./selector",
"./traversing", "./traversing",
"./event", "./event",
"./support" "./support"
], function( jQuery, concat, push, deletedIds, rcheckableType ){ ], function( jQuery, concat, push, deletedIds, strundefined, rcheckableType ){
function createSafeFragment( document ) { function createSafeFragment( document ) {
var list = nodeNames.split( "|" ), var list = nodeNames.split( "|" ),
......
...@@ -2521,6 +2521,12 @@ if ( hasPHP ) { ...@@ -2521,6 +2521,12 @@ if ( hasPHP ) {
(function(){ (function(){
// This code must be run before DOM ready! // This code must be run before DOM ready!
if ( QUnit.urlParams.amd ) {
// If we load jQuery through requirejs DOM will be already loaded
return;
}
var notYetReady, noEarlyExecution, var notYetReady, noEarlyExecution,
order = [], order = [],
args = {}; args = {};
......
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