From ef694f6cc77674fc119b8bfa32c74aa456b84eb6 Mon Sep 17 00:00:00 2001 From: Oleg Gaidarenko Date: Fri, 16 Aug 2013 14:36:08 -0400 Subject: [PATCH] Don't execute DOM ready tests in AMD mode (they aren't loaded before DOM ready). Close gh-1335. Conflicts: src/manipulation.js --- test/unit/event.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/unit/event.js b/test/unit/event.js index 9ea75fb81..e1b1b3922 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -2448,6 +2448,12 @@ if ( hasPHP ) { (function(){ // 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, order = [], args = {};