Move require.js to first tag so it can catch jquery module registration, otherwise jquery may be loaded twice.

This commit is contained in:
jrburke 2012-01-06 16:45:50 -08:00 committed by scottjehl
parent 9b0e263248
commit befdd49643
22 changed files with 34 additions and 24 deletions

View file

@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Button Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
@ -13,7 +14,6 @@
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
<link rel="stylesheet" href="../../../external/qunit.css"/>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -4,11 +4,11 @@
<meta charset="UTF-8" />
<title>jQuery Mobile Button Markup Test Suite</title>
<!-- meta viewport left out on purpose for test append -->
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta charset="UTF-8" />
<title>jQuery Mobile Checkboxradio Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Collapsible Integration Test</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta charset="UTF-8" />
<title>jQuery Mobile Checkboxradio Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Core Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Degrade Inputs Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -12,10 +12,10 @@
$.mobile.page.prototype.options.contentTheme = "d";
});
</script>
<script src="../../../external/requirejs/require.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<title>jQuery Mobile FieldContain Integration Test</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -4,11 +4,11 @@
<meta charset="UTF-8" />
<title>jQuery Mobile Init Test Suite</title>
<!-- meta viewport left out on purpose for test append -->
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Listview Integration Test</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Listview Integration Test</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Media Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Navigation Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Page Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Page Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,13 +5,23 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Select Events Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/qunit.js"></script>
<script type="text/javascript" src="../../../js"></script>
<script type="text/javascript" src="select_cached.js"></script>
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css"/>
<script>
$.testHelper.asyncLoad([
[
"jquery.mobile.forms.select",
"jquery.mobile.forms.select.custom"
],
[ "jquery.mobile.init" ],
[ "select_cached.js" ]
]);
</script>
<link rel="stylesheet" href="../../../css/themes/default/"/>
<link rel="stylesheet" href="../../../external/qunit.css"/>
<script src="../swarminject.js"></script>

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Select Events Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Slider Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,10 +5,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Support Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,10 +5,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Textinput Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[

View file

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Widget Test Suite</title>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../js/jquery.js"></script>
<script src="../jquery.setNameSpace.js"></script>
<script src="../../../external/qunit.js"></script>
<script src="../../../tests/jquery.testHelper.js"></script>
<script src="../../../external/requirejs/require.js"></script>
<script>
$.testHelper.asyncLoad([
[ "widget_init.js" ],