X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=test%2Findex.html;h=0127c439aff3e70bad0d42a3c5b9b20ec8737068;hb=9e48649729a5d4cd9ce52bcba067ba33a562cb4b;hp=00ca904f90fadc30dd574a2d253314c993581388;hpb=1ac9d6fbeed214d59ea5c31a87ff2c19bb08dbc8;p=jquery.git

diff --git a/test/index.html b/test/index.html
index 00ca904..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 .noConflcit()</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,6 +27,11 @@
 	<h2 id="userAgent"></h2>
 	
 	<!-- Test HTML -->
+	<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;">
 	<div id="main" style="display: none;">
 		<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
@@ -40,7 +52,7 @@
 		<ul id="firstUL"></ul>
 		<ol id="empty"></ol>
 		<form id="form" action="formaction">
-			<input type="text" name="action" value="Test" id="text1"/>
+			<input type="text" name="action" value="Test" id="text1" maxlength="30"/>
 			<input type="text" name="text2" value="Test" id="text2" disabled="disabled"/>
 			<input type="radio" name="radio1" id="radio1" value="on"/>
 
@@ -55,22 +67,22 @@
 			
 			<button id="button" name="button">Button</button>
 			
-			<textarea id="area1">foobar</textarea>
+			<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>
@@ -132,16 +144,25 @@ Z</textarea>
 			<input type="radio" name="R1" value="2" />
 			<input type="text" name="My Name" value="me" />
 			<input type="reset" name="reset" value="NO" />
-			<select name="S1">
				<option value="abc">ABC</option>
				<option value="abc">ABC</option>
				<option value="abc">ABC</option>
			</select>
			<select name="S2" multiple="multiple" size="3">
				<option value="abc">ABC</option>

				<option value="abc">ABC</option>
				<option value="abc">ABC</option>
			</select>
+			<select name="S1">
+				<option value="abc">ABC</option>
+				<option value="abc">ABC</option>
+				<option value="abc">ABC</option>
+			</select>
+			<select name="S2" multiple="multiple" size="3">
+				<option value="abc">ABC</option>
+				<option value="abc">ABC</option>
+				<option value="abc">ABC</option>
+			</select>
 			<select name="S3">
 				<option selected="selected">YES</option>
 			</select>
 			<select name="S4">
 				<option value="" selected="selected">NO</option>
 			</select>
-			<input type="submit"  name="sub1" value="NO" />
-			<input type="submit"  name="sub2" value="NO" />
-			<input type="image" name="sub3" value="NO" src="submit.gif" />
+			<input type="submit" name="sub1" value="NO" />
+			<input type="submit" name="sub2" value="NO" />
+			<input type="image" name="sub3" value="NO" />
 			<button name="sub4" type="submit" value="NO">NO</button>
 			<input name="D1" type="text" value="NO" disabled="disabled" />
 			<input type="checkbox" checked="checked" disabled="disabled" name="D2" value="NO" />
@@ -150,6 +171,20 @@ Z</textarea>
 				<option selected="selected" value="NO">NO</option>
 			</select>
 		</form>
+		<div id="moretests">
+			<form>
+				<div id="checkedtest" style="display:none;">
+					<input type="radio" name="checkedtestradios" checked="checked"/>
+					<input type="radio" name="checkedtestradios" value="on"/>
+					<input type="checkbox" name="checkedtestcheckboxes" checked="checked"/>
+					<input type="checkbox" name="checkedtestcheckboxes" />
+				</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>