X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Findex.html;h=0127c439aff3e70bad0d42a3c5b9b20ec8737068;hb=fa13d6009d5f7a6b2c51463522ce1ced49110410;hp=cdd6a30be073b2157aa95f4c6632b0ca4dba7642;hpb=ffbedf0262b3eea906f39c0115b818d7456a3994;p=jquery.git

diff --git a/test/index.html b/test/index.html
index cdd6a30..0127c43 100644
--- a/test/index.html
+++ b/test/index.html
@@ -4,10 +4,17 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>jQuery Test Suite</title>
 	<link rel="Stylesheet" media="screen" href="data/testsuite.css" />
-	<script>var jQuery = "jQuery", $ = "$"; // For testing .noConflict()</script>
+	<!-- Includes -->
+	<script type="text/javascript">
+		var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
+			$ = this.$ || "$",
+			originaljQuery = jQuery,
+			original$ = $;
+	</script>
 	<script type="text/javascript" src="../dist/jquery.js"></script>
 	<script type="text/javascript" src="data/testrunner.js"></script>
 	<script type="text/javascript" src="unit/core.js"></script>
+	<script type="text/javascript" src="unit/dimensions.js"></script>
 	<script type="text/javascript" src="unit/selector.js"></script>
 	<script type="text/javascript" src="unit/event.js"></script>
 	<script type="text/javascript" src="unit/ajax.js"></script>
@@ -20,7 +27,9 @@
 	<h2 id="userAgent"></h2>
 	
 	<!-- Test HTML -->
-	<div id="nothiddendiv" style="height:1px;background:white;"></div>
+	<div id="nothiddendiv" style="height:1px;background:white;">
+		<div id="nothiddendivchild"></div>
+	</div>
 	<!-- this iframe is outside the #main so it won't reload constantly wasting time, but it means the tests must be "safe" and clean up after themselves -->
 	<iframe id="loadediframe" name="loadediframe" style="display:none;" src="data/iframe.html"></iframe>
 	<dl id="dl" style="display:none;">
@@ -61,19 +70,19 @@
 			<textarea id="area1" maxlength="30">foobar</textarea>
 			
 			<select name="select1" id="select1">
-				<option id="option1a" value="">Nothing</option>
+				<option id="option1a" class="emptyopt" value="">Nothing</option>
 				<option id="option1b" value="1">1</option>
 				<option id="option1c" value="2">2</option>
 				<option id="option1d" value="3">3</option>
 			</select>
 			<select name="select2" id="select2">
-				<option id="option2a" value="">Nothing</option>
+				<option id="option2a" class="emptyopt" value="">Nothing</option>
 				<option id="option2b" value="1">1</option>
 				<option id="option2c" value="2">2</option>
 				<option id="option2d" selected="selected" value="3">3</option>
 			</select>
 			<select name="select3" id="select3" multiple="multiple">
-				<option id="option3a" value="">Nothing</option>
+				<option id="option3a" class="emptyopt" value="">Nothing</option>
 				<option id="option3b" selected="selected" value="1">1</option>
 				<option id="option3c" selected="selected" value="2">2</option>
 				<option id="option3d" value="3">3</option>
@@ -172,6 +181,9 @@ Z</textarea>
 				</div>
 			</form>
 			<div id="nonnodes"><span>hi</span> there <!-- mon ami --></div>
+			<div id="t2037">
+				<div><div class="hidden">hidden</div></div>
+			</div>
 		</div>
 	</div>
 	</dl>