Merge branch 'master' of github.com:jquery/jquery

8 files changed, 74 insertions, 7 deletions

diff --git a/test/data/offset/absolute.html b/test/data/offset/absolute.html
index 2a7eb73e5..dc0ba22f2 100644
--- a/test/data/offset/absolute.html
+++ b/test/data/offset/absolute.html
@@ -15,6 +15,15 @@
 			p.instructions { position: absolute; bottom: 0; }
 			#positionTest { position: absolute; }
 		</style>
+		<script src="../../../src/core.js"></script>
+		<script src="../../../src/support.js"></script>
+		<script src="../../../src/sizzle/sizzle.js"></script>
+		<script src="../../../src/sizzle-jquery.js"></script>
+		<script src="../../../src/traversing.js"></script>
+		<script src="../../../src/data.js"></script>
+		<script src="../../../src/event.js"></script>
+		<script src="../../../src/css.js"></script>
+		<script src="../../../src/offset.js"></script>
 		<script type="text/javascript" src="../../../dist/jquery.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			$(function() {
@@ -38,4 +47,4 @@
 		<div id="marker"></div>
 		<p class="instructions">Click the white box to move the marker to it. Clicking the box also changes the position to absolute (if not already) and sets the position according to the position method.</p>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/data/offset/body.html b/test/data/offset/body.html
index 1f13dd5bc..9a692e800 100644
--- a/test/data/offset/body.html
+++ b/test/data/offset/body.html
@@ -8,7 +8,15 @@
 			body { margin: 1px; padding: 5px; }
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
-		<script type="text/javascript" src="../../../dist/jquery.js"></script>
+		<script src="../../../src/core.js"></script>
+		<script src="../../../src/support.js"></script>
+		<script src="../../../src/sizzle/sizzle.js"></script>
+		<script src="../../../src/sizzle-jquery.js"></script>
+		<script src="../../../src/traversing.js"></script>
+		<script src="../../../src/data.js"></script>
+		<script src="../../../src/event.js"></script>
+		<script src="../../../src/css.js"></script>
+		<script src="../../../src/offset.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			$(function() {
 				$('body').click(function() {
diff --git a/test/data/offset/fixed.html b/test/data/offset/fixed.html
index 8d69aae94..f795e5c99 100644
--- a/test/data/offset/fixed.html
+++ b/test/data/offset/fixed.html
@@ -12,7 +12,15 @@
 			#forceScroll { width: 5000px; height: 5000px; }
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
-		<script type="text/javascript" src="../../../dist/jquery.js"></script>
+		<script src="../../../src/core.js"></script>
+		<script src="../../../src/support.js"></script>
+		<script src="../../../src/sizzle/sizzle.js"></script>
+		<script src="../../../src/sizzle-jquery.js"></script>
+		<script src="../../../src/traversing.js"></script>
+		<script src="../../../src/data.js"></script>
+		<script src="../../../src/event.js"></script>
+		<script src="../../../src/css.js"></script>
+		<script src="../../../src/offset.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			$(function() {
 				window.scrollTo(1000,1000);
diff --git a/test/data/offset/relative.html b/test/data/offset/relative.html
index 55f0da83f..bfcd147c3 100644
--- a/test/data/offset/relative.html
+++ b/test/data/offset/relative.html
@@ -10,7 +10,15 @@
 			#relative-2 { top: 20px; left: 20px; }
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
-		<script type="text/javascript" src="../../../dist/jquery.js"></script>
+		<script src="../../../src/core.js"></script>
+		<script src="../../../src/support.js"></script>
+		<script src="../../../src/sizzle/sizzle.js"></script>
+		<script src="../../../src/sizzle-jquery.js"></script>
+		<script src="../../../src/traversing.js"></script>
+		<script src="../../../src/data.js"></script>
+		<script src="../../../src/event.js"></script>
+		<script src="../../../src/css.js"></script>
+		<script src="../../../src/offset.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			$(function() {
 				$('.relative').click(function() {
diff --git a/test/data/offset/scroll.html b/test/data/offset/scroll.html
index 494f64058..e6980b441 100644
--- a/test/data/offset/scroll.html
+++ b/test/data/offset/scroll.html
@@ -13,7 +13,15 @@
 			#forceScroll { width: 5000px; height: 5000px; }
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
-		<script type="text/javascript" src="../../../dist/jquery.js"></script>
+		<script src="../../../src/core.js"></script>
+		<script src="../../../src/support.js"></script>
+		<script src="../../../src/sizzle/sizzle.js"></script>
+		<script src="../../../src/sizzle-jquery.js"></script>
+		<script src="../../../src/traversing.js"></script>
+		<script src="../../../src/data.js"></script>
+		<script src="../../../src/event.js"></script>
+		<script src="../../../src/css.js"></script>
+		<script src="../../../src/offset.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			$(function() {
 				window.scrollTo(1000,1000);
diff --git a/test/data/offset/static.html b/test/data/offset/static.html
index 6a499298d..f47a79b39 100644
--- a/test/data/offset/static.html
+++ b/test/data/offset/static.html
@@ -10,7 +10,15 @@
 			#static-2 { top: 20px; left: 20px; }
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
-		<script type="text/javascript" src="../../../dist/jquery.js"></script>
+		<script src="../../../src/core.js"></script>
+		<script src="../../../src/support.js"></script>
+		<script src="../../../src/sizzle/sizzle.js"></script>
+		<script src="../../../src/sizzle-jquery.js"></script>
+		<script src="../../../src/traversing.js"></script>
+		<script src="../../../src/data.js"></script>
+		<script src="../../../src/event.js"></script>
+		<script src="../../../src/css.js"></script>
+		<script src="../../../src/offset.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			$(function() {
 				$('.static').click(function() {
diff --git a/test/data/offset/table.html b/test/data/offset/table.html
index 5d15b903b..83fb559f3 100644
--- a/test/data/offset/table.html
+++ b/test/data/offset/table.html
@@ -10,7 +10,15 @@
 			th, td { border: 1px solid #000; width: 100px; height: 100px; }
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
-		<script type="text/javascript" src="../../../dist/jquery.js"></script>
+		<script src="../../../src/core.js"></script>
+		<script src="../../../src/support.js"></script>
+		<script src="../../../src/sizzle/sizzle.js"></script>
+		<script src="../../../src/sizzle-jquery.js"></script>
+		<script src="../../../src/traversing.js"></script>
+		<script src="../../../src/data.js"></script>
+		<script src="../../../src/event.js"></script>
+		<script src="../../../src/css.js"></script>
+		<script src="../../../src/offset.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			$(function() {
 				$('table, th, td').click(function() {
diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index 95a1b6eec..a0eb3621a 100644
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -1 +1,11 @@
 jQuery.noConflict(); // Allow the test to run with other libs or jQuery's.
+
+// load testswarm agent
+(function() {
+	var url = window.location.search;
+	url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
+	if ( !url || url.indexOf("http") !== 0 ) {
+		return;
+	}
+	document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>");
+})();