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:39:42 -0400 |
| commit | ef694f6cc77674fc119b8bfa32c74aa456b84eb6 (patch) | |
| tree | afc066b250822c52a23fc08e03e4d73bdba717f4 /test | |
| parent | b693b370a459ef89ef187518b832a45b6e848eca (diff) | |
| download | jquery-ef694f6cc77674fc119b8bfa32c74aa456b84eb6.tar.gz jquery-ef694f6cc77674fc119b8bfa32c74aa456b84eb6.zip | |
Don't execute DOM ready tests in AMD mode (they aren't loaded before DOM ready). Close gh-1335.
Conflicts:
src/manipulation.js
Diffstat (limited to 'test')
| -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 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 = {}; |