diff options
| author | Oleg Gaidarenko <markelog@gmail.com> | 2013-08-16 14:36:08 -0400 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2013-08-16 14:36:08 -0400 |
| commit | 49670c5f483d944eafdcc494e697f04fd6d9fbbd (patch) | |
| tree | e5631bc8f550f9cc3ad50953b5034c58c9545452 /test/unit | |
| parent | ca4a0075247ddeaa3fceb42179aa278bf28669f8 (diff) | |
| download | jquery-49670c5f483d944eafdcc494e697f04fd6d9fbbd.tar.gz jquery-49670c5f483d944eafdcc494e697f04fd6d9fbbd.zip | |
Don't execute DOM ready tests in AMD mode (they aren't loaded before DOM ready). Close gh-1335.
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/event.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/unit/event.js b/test/unit/event.js index 40fb73281..704c49636 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -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 = {}; |