diff options
| author | Richard Gibson <richard.gibson@gmail.com> | 2012-11-01 00:40:27 -0400 |
|---|---|---|
| committer | Richard Gibson <richard.gibson@gmail.com> | 2012-11-01 00:40:27 -0400 |
| commit | 14e1501b89491bad5744af4f2a8d084834f9c295 (patch) | |
| tree | 89a65f671f40158b94666acdcce9cc2048b08300 /test/data/testinit.js | |
| parent | 03a076281722b171e904009107f9cb45f5d955af (diff) | |
| download | jquery-14e1501b89491bad5744af4f2a8d084834f9c295.tar.gz jquery-14e1501b89491bad5744af4f2a8d084834f9c295.zip | |
Fix testing of no-ajax custom builds
Diffstat (limited to 'test/data/testinit.js')
| -rw-r--r-- | test/data/testinit.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/data/testinit.js b/test/data/testinit.js index 3bbee9658..1e6b33334 100644 --- a/test/data/testinit.js +++ b/test/data/testinit.js @@ -1,15 +1,17 @@ /*jshint multistr:true */ -var jQuery = this.jQuery || "jQuery", // For testing .noConflict() - $ = this.$ || "$", - originaljQuery = jQuery, - original$ = $, +var originaljQuery = this.jQuery || "jQuery", + original$ = this.$ || "$", hasPHP = true, // Disable Ajax tests to reduce network strain // Re-enabled (at least the variable should be declared) isLocal = window.location.protocol === "file:", amdDefined; +// For testing .noConflict() +this.jQuery = originaljQuery; +this.$ = original$; + /** * Set up a mock AMD define function for testing AMD registration. */ |