]> 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:36:08 +0000 (14:36 -0400)
src/manipulation.js
test/unit/event.js

index 8cc7624bfabdc65b0213b3bd5ab341efc2132fb0..faa11eb284ef97601d9e3f7140510cf33ff07746 100644 (file)
@@ -3,13 +3,14 @@ define([
        "./var/concat",
        "./var/push",
        "./var/deletedIds",
+       "./var/strundefined",
        "./manipulation/var/rcheckableType",
        "./data/accepts",
        "./selector",
        "./traversing",
        "./event",
        "./support"
-], function( jQuery, concat, push, deletedIds, rcheckableType ){
+], function( jQuery, concat, push, deletedIds, strundefined, rcheckableType ){
 
 function createSafeFragment( document ) {
        var list = nodeNames.split( "|" ),
index 40fb7328167fc5975194441c4a7a1d542fb1a879..704c4963674a80248732a59236c455340fa60826 100644 (file)
@@ -2521,6 +2521,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 = {};