Commit ef694f6c 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.

Conflicts:
	src/manipulation.js
parent b693b370
...@@ -2448,6 +2448,12 @@ if ( hasPHP ) { ...@@ -2448,6 +2448,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