From befdd49643c259c96e4db4f1a2732b8a84cf207a Mon Sep 17 00:00:00 2001
From: jrburke <jrburke@gmail.com>
Date: Fri, 6 Jan 2012 16:45:50 -0800
Subject: [PATCH] Move require.js to first tag so it can catch jquery module
 registration, otherwise jquery may be loaded twice.

---
 tests/unit/button/index.html             |  2 +-
 tests/unit/buttonMarkup/index.html       |  2 +-
 tests/unit/checkboxradio/index.html      |  2 +-
 tests/unit/collapsible/index.html        |  2 +-
 tests/unit/controlgroup/index.html       |  2 +-
 tests/unit/core/index.html               |  2 +-
 tests/unit/degradeInputs/index.html      |  2 +-
 tests/unit/dialog/index.html             |  2 +-
 tests/unit/fieldContain/index.html       |  2 +-
 tests/unit/init/index.html               |  2 +-
 tests/unit/listview/index.html           |  2 +-
 tests/unit/listview/pushstate-tests.html |  2 +-
 tests/unit/media/index.html              |  2 +-
 tests/unit/navbar/index.html             |  2 +-
 tests/unit/page-sections/index.html      |  2 +-
 tests/unit/page/index.html               |  2 +-
 tests/unit/select/cached-tests.html      | 16 +++++++++++++---
 tests/unit/select/index.html             |  2 +-
 tests/unit/slider/index.html             |  2 +-
 tests/unit/support/index.html            |  2 +-
 tests/unit/textinput/index.html          |  2 +-
 tests/unit/widget/index.html             |  2 +-
 22 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/tests/unit/button/index.html b/tests/unit/button/index.html
index ae6b3864..abb6fba7 100644
--- a/tests/unit/button/index.html
+++ b/tests/unit/button/index.html
@@ -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([
 			[
diff --git a/tests/unit/buttonMarkup/index.html b/tests/unit/buttonMarkup/index.html
index 53749477..67f813e8 100644
--- a/tests/unit/buttonMarkup/index.html
+++ b/tests/unit/buttonMarkup/index.html
@@ -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([
 			[
diff --git a/tests/unit/checkboxradio/index.html b/tests/unit/checkboxradio/index.html
index 40e3e80a..dbfd0282 100644
--- a/tests/unit/checkboxradio/index.html
+++ b/tests/unit/checkboxradio/index.html
@@ -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([
 			[
diff --git a/tests/unit/collapsible/index.html b/tests/unit/collapsible/index.html
index b45e01f6..b4dd72be 100644
--- a/tests/unit/collapsible/index.html
+++ b/tests/unit/collapsible/index.html
@@ -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([
 			[
diff --git a/tests/unit/controlgroup/index.html b/tests/unit/controlgroup/index.html
index 1e5f2e87..6896eba8 100644
--- a/tests/unit/controlgroup/index.html
+++ b/tests/unit/controlgroup/index.html
@@ -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([
 			[
diff --git a/tests/unit/core/index.html b/tests/unit/core/index.html
index e53a8297..86e7a970 100644
--- a/tests/unit/core/index.html
+++ b/tests/unit/core/index.html
@@ -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([
 			[
diff --git a/tests/unit/degradeInputs/index.html b/tests/unit/degradeInputs/index.html
index 045b07ec..2a2c0cf3 100644
--- a/tests/unit/degradeInputs/index.html
+++ b/tests/unit/degradeInputs/index.html
@@ -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([
 			[
diff --git a/tests/unit/dialog/index.html b/tests/unit/dialog/index.html
index e62337aa..a194332c 100644
--- a/tests/unit/dialog/index.html
+++ b/tests/unit/dialog/index.html
@@ -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([
 			[
diff --git a/tests/unit/fieldContain/index.html b/tests/unit/fieldContain/index.html
index 9281dedf..5db0ece0 100644
--- a/tests/unit/fieldContain/index.html
+++ b/tests/unit/fieldContain/index.html
@@ -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([
 			[
diff --git a/tests/unit/init/index.html b/tests/unit/init/index.html
index f1b7f741..1c2a8265 100644
--- a/tests/unit/init/index.html
+++ b/tests/unit/init/index.html
@@ -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([
 			[
diff --git a/tests/unit/listview/index.html b/tests/unit/listview/index.html
index 4e70a2d9..a21da7e0 100644
--- a/tests/unit/listview/index.html
+++ b/tests/unit/listview/index.html
@@ -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([
 			[
diff --git a/tests/unit/listview/pushstate-tests.html b/tests/unit/listview/pushstate-tests.html
index ff62bdf1..52cf657c 100644
--- a/tests/unit/listview/pushstate-tests.html
+++ b/tests/unit/listview/pushstate-tests.html
@@ -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([
 			[
diff --git a/tests/unit/media/index.html b/tests/unit/media/index.html
index a5248d2c..448bdc57 100644
--- a/tests/unit/media/index.html
+++ b/tests/unit/media/index.html
@@ -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([
 			[
diff --git a/tests/unit/navbar/index.html b/tests/unit/navbar/index.html
index 0733141d..30c2ec64 100644
--- a/tests/unit/navbar/index.html
+++ b/tests/unit/navbar/index.html
@@ -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([
 			[
diff --git a/tests/unit/page-sections/index.html b/tests/unit/page-sections/index.html
index 9d357ac4..483a50bb 100644
--- a/tests/unit/page-sections/index.html
+++ b/tests/unit/page-sections/index.html
@@ -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([
 			[
diff --git a/tests/unit/page/index.html b/tests/unit/page/index.html
index 321ae7c1..2dfa7b36 100644
--- a/tests/unit/page/index.html
+++ b/tests/unit/page/index.html
@@ -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([
 			[
diff --git a/tests/unit/select/cached-tests.html b/tests/unit/select/cached-tests.html
index b63ff5e1..379f778c 100644
--- a/tests/unit/select/cached-tests.html
+++ b/tests/unit/select/cached-tests.html
@@ -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>
diff --git a/tests/unit/select/index.html b/tests/unit/select/index.html
index b42b9c78..a6075313 100644
--- a/tests/unit/select/index.html
+++ b/tests/unit/select/index.html
@@ -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([
 			[
diff --git a/tests/unit/slider/index.html b/tests/unit/slider/index.html
index 9278b98d..79a8342f 100644
--- a/tests/unit/slider/index.html
+++ b/tests/unit/slider/index.html
@@ -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([
 			[
diff --git a/tests/unit/support/index.html b/tests/unit/support/index.html
index 1a5a8a98..fbbe6add 100644
--- a/tests/unit/support/index.html
+++ b/tests/unit/support/index.html
@@ -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([
 			[
diff --git a/tests/unit/textinput/index.html b/tests/unit/textinput/index.html
index c5d3ae91..8613e10a 100644
--- a/tests/unit/textinput/index.html
+++ b/tests/unit/textinput/index.html
@@ -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([
 			[
diff --git a/tests/unit/widget/index.html b/tests/unit/widget/index.html
index 08a0ad35..a8421ae9 100644
--- a/tests/unit/widget/index.html
+++ b/tests/unit/widget/index.html
@@ -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" ],