diff options
| author | Timmy Willison <4timmywil@gmail.com> | 2016-08-15 11:41:11 -0400 |
|---|---|---|
| committer | Timmy Willison <4timmywil@gmail.com> | 2016-08-15 11:54:55 -0400 |
| commit | 52e24471c89b80e6208b4987bb76994e64c1e489 (patch) | |
| tree | 5914b1a5bec65c59f94f9780f45b35029d03641a /test/data | |
| parent | 560c0c6f995a4f7584dac5be8fe5eea114a95f69 (diff) | |
| download | jquery-52e24471c89b80e6208b4987bb76994e64c1e489.tar.gz jquery-52e24471c89b80e6208b4987bb76994e64c1e489.zip | |
Core: expose noConflict in AMD mode
- For compability reasons, we had already added the global
in AMD mode, but without noConflict. This adds back noConflict
to AMD (which fixes noConflict mode in the tests).
Fixes gh-2930
Diffstat (limited to 'test/data')
| -rw-r--r-- | test/data/testinit.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/data/testinit.js b/test/data/testinit.js index 9e2679654..ef210e739 100644 --- a/test/data/testinit.js +++ b/test/data/testinit.js @@ -320,9 +320,7 @@ this.loadTests = function() { /** * Run in noConflict mode */ - if ( jQuery.noConflict ) { - jQuery.noConflict(); - } + jQuery.noConflict(); // Load the TestSwarm listener if swarmURL is in the address. if ( QUnit.isSwarm ) { |