]> source.dussan.org Git - jquery.git/commitdiff
Don't execute DOM ready tests in AMD mode (they aren't loaded before DOM ready)....
authorOleg Gaidarenko <markelog@gmail.com>
Fri, 16 Aug 2013 18:36:08 +0000 (14:36 -0400)
committerTimmy Willison <timmywillisn@gmail.com>
Fri, 16 Aug 2013 18:39:42 +0000 (14:39 -0400)
Conflicts:
src/manipulation.js

test/unit/event.js

index 9ea75fb81cfb97db728a7dcc45d30cde31823a6b..e1b1b39225ac27a97403392337475a3f6a58df3f 100644 (file)
@@ -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 = {};