diff options
author | Timmy Willison <timmywillisn@gmail.com> | 2013-08-15 14:15:49 -0400 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2013-08-15 15:49:49 -0400 |
commit | 217cbb7109b7a5bbacd3170e90607ca5972fc1cd (patch) | |
tree | 4deb7b42f248f7ea73398dc329584899b5573413 /test/index.html | |
parent | 144837afdfab98d6a9f753bc4ccc1feede410101 (diff) | |
download | jquery-217cbb7109b7a5bbacd3170e90607ca5972fc1cd.tar.gz jquery-217cbb7109b7a5bbacd3170e90607ca5972fc1cd.zip |
AMD-ify jQuery sourcegit s! Woo! Fixes #14113, #14163.
Conflicts:
Gruntfile.js
README.md
src/ajax.js
src/ajax/xhr.js
src/attributes.js
src/core.js
src/css.js
src/data.js
src/effects.js
src/event.js
src/manipulation.js
src/offset.js
src/selector-native.js
src/traversing.js
test/unit/core.js
test/unit/data.js
Diffstat (limited to 'test/index.html')
-rw-r--r-- | test/index.html | 84 |
1 files changed, 27 insertions, 57 deletions
diff --git a/test/index.html b/test/index.html index 0bacc19c3..778dc4dff 100644 --- a/test/index.html +++ b/test/index.html @@ -14,63 +14,33 @@ <script src="data/testinit.js"></script> <script src="../bower_components/qunit/qunit/qunit.js"></script> - <script> - (function() { - var src = "../dist/jquery.min.js"; - - // Config parameter to use minified jQuery - QUnit.config.urlConfig.push({ - id: "dev", - label: "Load unminified", - tooltip: "Load the development (unminified) jQuery file" - }); - if ( QUnit.urlParams.dev ) { - src = "../dist/jquery.js"; - } - - // Config parameter to force basic code paths - QUnit.config.urlConfig.push({ - id: "basic", - label: "Bypass optimizations", - tooltip: "Force use of the most basic code by disabling native querySelectorAll; contains; compareDocumentPosition" - }); - if ( QUnit.urlParams.basic ) { - document.querySelectorAll = null; - document.documentElement.contains = null; - document.documentElement.compareDocumentPosition = null; - } - - // Load jQuery - document.write( "<script id='jquery-js' src='" + src + "'><\x2Fscript>" ); - })(); - </script> - <script src="data/testrunner.js"></script> - - <script src="unit/core.js"></script> - <script src="unit/callbacks.js"></script> - <script src="unit/deferred.js"></script> - <script src="unit/support.js"></script> - <script src="unit/data.js"></script> - <script src="unit/queue.js"></script> - <script src="unit/attributes.js"></script> - <script src="unit/event.js"></script> - <script src="unit/selector.js"></script> - <script src="unit/traversing.js"></script> - <script src="unit/manipulation.js"></script> - <script src="unit/wrap.js"></script> - <script src="unit/css.js"></script> - <script src="unit/serialize.js"></script> - <script src="unit/ajax.js"></script> - <script src="unit/effects.js"></script> - <script src="unit/offset.js"></script> - <script src="unit/dimensions.js"></script> - <script src="unit/deprecated.js"></script> - <script src="unit/exports.js"></script> - - <!-- Subproject tests must be last because they replace our test fixture --> - <script> - testSubproject( "Sizzle", "../bower_components/sizzle/test/", /^unit\/.*\.js$/ ); - </script> + <script src="../bower_components/requirejs/require.js"></script> + <script>loadTests = [ + "data/testrunner.js", + "unit/core.js", + "unit/callbacks.js", + "unit/deferred.js", + "unit/support.js", + "unit/data.js", + "unit/queue.js", + "unit/attributes.js", + "unit/event.js", + "unit/selector.js", + "unit/traversing.js", + "unit/manipulation.js", + "unit/wrap.js", + "unit/css.js", + "unit/serialize.js", + "unit/ajax.js", + "unit/effects.js", + "unit/offset.js", + "unit/dimensions.js" + ];</script> + <!-- A script that includes jQuery min, dev, or AMD --> + <!-- Adds "basic" URL option, even to iframes --> + <!-- iframes will not load AMD as loading needs to be synchronous for some tests --> + <!-- Also loads the tests above synchronously with min or dev and async with AMD --> + <script src="jquery.js"></script> <script> // html5shiv, enabling HTML5 elements to be used with jQuery |