accordion: added test for headers with descendants; replaced while-loop to find header-parent with call to parents

3 files changed, 198 insertions, 256 deletions

diff --git a/tests/accordion.html b/tests/accordion.html
index 194b130b2..275ebe0e7 100644
--- a/tests/accordion.html
+++ b/tests/accordion.html
@@ -33,145 +33,108 @@
 
 <div id="main" style="position:absolute;top:-2000000px;">
 
-	<fieldset>
-		<legend>Standard, container is a div, header is h3 and content p</legend>
+	<div id="list1">
+		<a>There is one obvious advantage:</a>
+		<div>
+			<p>
+				You've seen it coming!<br/>
+				Buy now and get nothing for free!<br/>
+				Well, at least no free beer. Perhaps a bear, if you can afford it.
+			</p>
+		</div>
+		<a>Now that you've got...</a>
+		<div>
+			<p>
+				your bear, you have to admit it!<br/>
+				No, we aren't selling bears.
+			</p>
+			<p>
+				We could talk about renting one.
+			</p>
+		</div>
+		<a>Rent one bear, ...</a>
+		<div>
+			<p>
+				get two for three beer.
+			</p>
+			<p>
+				And now, for something completely different.
+			</p>
+		</div>
+	</div>
 
-		<div id="list1">
-			<a>There is one obvious advantage:</a>
-			<div>
-				<p>
-					You've seen it coming!<br/>
-					Buy now and get nothing for free!<br/>
-					Well, at least no free beer. Perhaps a bear, if you can afford it.
-				</p>
-			</div>
-			<a>Now that you've got...</a>
-			<div>
-				<p>
-					your bear, you have to admit it!<br/>
-					No, we aren't selling bears.
-				</p>
-				<p>
-					We could talk about renting one.
-				</p>
-			</div>
-			<a>Rent one bear, ...</a>
+	<ul id="navigation">
+		<li>
+			<a class="head" href="?p=1.1.1">Guitar</a>
+			<ul>
+				<li><a href="?p=1.1.1.1">Electric</a></li>
+				<li><a href="?p=1.1.1.2">Acoustic</a></li>
+				<li><a href="?p=1.1.1.3">Amps</a></li>
+				<li><a href="?p=1.1.1.4">Effects</a></li>
+				<li><a href="?p=1.1.1.5">Accessories</a></li>
+			</ul> 
+		</li>
+		<li>
+			<a class="head" href="?p=1.1.2"><span>Bass</span></a>
+			<ul>
+				<li><a href="?p=1.1.2.1">Electric</a></li>
+				<li><a href="?p=1.1.2.2">Acoustic</a></li>
+				<li><a href="?p=1.1.2.3">Amps</a></li>
+				<li><a href="?p=1.1.2.4">Effects</a></li>
+				<li><a href="?p=1.1.2.5">Accessories</a></li>
+				<li><a href="?p=1.1.2.5">Accessories</a></li>
+				<li><a href="?p=1.1.2.5">Accessories</a></li>
+			</ul> 
+		</li>
+		<li>
+			<a class="head" href="?p=1.1.3">Drums</a>
+			<ul>
+				<li><a href="?p=1.1.3.2">Acoustic Drums</a></li>
+				<li><a href="?p=1.1.3.3">Electronic Drums</a></li>
+				<li><a href="?p=1.1.3.6">Accessories</a></li>
+			</ul> 
+		</li>
+	</ul>
+	<dl id="list2">
+		<dt class="red">Red</dt>
+		<dd>
+			Fancy stuff about red thingies.
+		</dd>
+		<dt class="green selected">Green</dt>
+		<dd>
+			Green! Green! Green!
+		</dd>
+		<dt class="blue">Blue</dt>
+		<dd>
+			Cool kids are blue.
+		</dd>
+	</dl>
+	
+	<div id="list3">
+		<div>
+			<div class="title">Tennis</div>
 			<div>
-				<p>
-					get two for three beer.
-				</p>
-				<p>
-					And now, for something completely different.
-				</p>
+				One ball, two players. Lots of fun.
 			</div>
 		</div>
-
-	</fieldset>
-	
-	<fieldset>
-		<legend>Navigation - Unordered List with anchors and nested lists.</legend>
-		<p>The first item is cloned to allow the user to select it. The
-		active element is choosen based on location.hash: Open Drums and click
-		the first item ('Drums'), then reload the page.</p>
-
-		<ul id="navigation">
-			<li>
-				<a class="head" href="?p=1.1.1">Guitar</a>
-				<ul>
-					<li><a href="?p=1.1.1.1">Electric</a></li>
-					<li><a href="?p=1.1.1.2">Acoustic</a></li>
-					<li><a href="?p=1.1.1.3">Amps</a></li>
-					<li><a href="?p=1.1.1.4">Effects</a></li>
-					<li><a href="?p=1.1.1.5">Accessories</a></li>
-				</ul> 
-			</li>
-			<li>
-				<a class="head" href="?p=1.1.2">Bass</a>
-				<ul>
-					<li><a href="?p=1.1.2.1">Electric</a></li>
-					<li><a href="?p=1.1.2.2">Acoustic</a></li>
-					<li><a href="?p=1.1.2.3">Amps</a></li>
-					<li><a href="?p=1.1.2.4">Effects</a></li>
-					<li><a href="?p=1.1.2.5">Accessories</a></li>
-					<li><a href="?p=1.1.2.5">Accessories</a></li>
-					<li><a href="?p=1.1.2.5">Accessories</a></li>
-				</ul> 
-			</li>
-			<li>
-				<a class="head" href="?p=1.1.3">Drums</a>
-				<ul>
-					<li><a href="?p=1.1.3.2">Acoustic Drums</a></li>
-					<li><a href="?p=1.1.3.3">Electronic Drums</a></li>
-					<li><a href="?p=1.1.3.6">Accessories</a></li>
-				</ul> 
-			</li>
-		</ul>
-
-	</fieldset>
-
-	<fieldset>
-		<legend>With options, container is a definition list, header dt, content dd</legend>
-		
-		<dl id="list2">
-			<dt class="red">Red</dt>
-			<dd>
-				Fancy stuff about red thingies.
-			</dd>
-			<dt class="green selected">Green</dt>
-			<dd>
-				Green! Green! Green!
-			</dd>
-			<dt class="blue">Blue</dt>
-			<dd>
-				Cool kids are blue.
-			</dd>
-		</dl>
-		
-	</fieldset>
-
-	<fieldset>
-		<legend>Divitus structure, div container, div header (class title), div
-		content, no active on startup and can be completely closed</legend>
-
-		<div id="list3">
+		<div>
+			<div class="title">Soccer</div>
 			<div>
-				<div class="title">Tennis</div>
-				<div>
-					One ball, two players. Lots of fun.
-				</div>
+				One ball, 22 players. Lots of fun.
 			</div>
+		</div>
+		<div>
+			<div class="title">Baseball</div>
 			<div>
-				<div class="title">Soccer</div>
-				<div>
-					One ball, 22 players. Lots of fun.
-				</div>
+				Well, one ball, some guys running around, some guys hitting others with a stick.<br/>
+				Sounds like fun, doesn't it?
 			</div>
 			<div>
-				<div class="title">Baseball</div>
-				<div>
-					Well, one ball, some guys running around, some guys hitting others with a stick.<br/>
-					Sounds like fun, doesn't it?
-				</div>
-				<div>
-					Well, apart from the running part.
-				</div>
+				Well, apart from the running part.
 			</div>
 		</div>
-		
-	</fieldset>
-		
-	<div id="switch">
-		<select>
-			<option>Switch to...</option>
-			<option value="1">1</option>
-			<option value="2">2</option>
-			<option value="3">3</option>
-		</select>
-		<button id="close">Close all</button>
-		Activate via selector, eg. ':first' or 'a:first': <input id="switch2" />
 	</div>
-
-	<div id="log"><div><strong>Log of the 2nd accordion</strong></div></div>
+		
 </div>
 
 </body>
diff --git a/tests/accordion.js b/tests/accordion.js
index 1fbd1e20c..e957acd43 100644
--- a/tests/accordion.js
+++ b/tests/accordion.js
@@ -10,10 +10,14 @@ jQuery.ui.accordion.defaults.animated = false;
 function state(accordion) {
 	var args = $.makeArray(arguments).slice(1);
 	$.each(args, function(i, n) {
-		equals(n, accordion.find("div").eq(i).is(":visible"));
+		equals(accordion.find("div").eq(i).is(":visible"), n);
 	});
 }
 
+$.fn.triggerEvent = function(type, target) {
+	return this.triggerHandler(type, [jQuery.event.fix({ type: type, target: target })]);
+}
+
 test("basics", function() {
 	state($('#list1').accordion(), 1, 0, 0);
 });
@@ -82,4 +86,17 @@ test("activate, jQuery or DOM element", function() {
 	state(ac, 0, 1, 0);
 });
 
+function state2(accordion) {
+	var args = $.makeArray(arguments).slice(1);
+	$.each(args, function(i, n) {
+		equals(accordion.find("ul").eq(i).is(":visible"), n);
+	});
+}
+
+test("handle click on header-descendant", function() {
+	var ac = $('#navigation').accordion({ header: '.head', autoHeight: false })
+	ac.triggerEvent("click", $('#navigation span:contains(Bass)')[0]);
+	state2(ac, 0, 1, 0);
+});
+
 })(jQuery);
diff --git a/tests/all.html b/tests/all.html
index ad46f8729..e5f85a27c 100644
--- a/tests/all.html
+++ b/tests/all.html
@@ -64,145 +64,107 @@
 		<div class="ui-slider-handle" style="position: absolute; height: 21px; left: 0px; bottom: 0px; width: 17px; background-image: url(http://developer.yahoo.com/yui/examples/slider/assets/thumb-n.gif);"></div>
 	</div>
 
-	<fieldset>
-		<legend>Standard, container is a div, header is h3 and content p</legend>
+	<div id="list1">
+		<a>There is one obvious advantage:</a>
+		<div>
+			<p>
+				You've seen it coming!<br/>
+				Buy now and get nothing for free!<br/>
+				Well, at least no free beer. Perhaps a bear, if you can afford it.
+			</p>
+		</div>
+		<a>Now that you've got...</a>
+		<div>
+			<p>
+				your bear, you have to admit it!<br/>
+				No, we aren't selling bears.
+			</p>
+			<p>
+				We could talk about renting one.
+			</p>
+		</div>
+		<a>Rent one bear, ...</a>
+		<div>
+			<p>
+				get two for three beer.
+			</p>
+			<p>
+				And now, for something completely different.
+			</p>
+		</div>
+	</div>
 
-		<div id="list1">
-			<a>There is one obvious advantage:</a>
-			<div>
-				<p>
-					You've seen it coming!<br/>
-					Buy now and get nothing for free!<br/>
-					Well, at least no free beer. Perhaps a bear, if you can afford it.
-				</p>
-			</div>
-			<a>Now that you've got...</a>
-			<div>
-				<p>
-					your bear, you have to admit it!<br/>
-					No, we aren't selling bears.
-				</p>
-				<p>
-					We could talk about renting one.
-				</p>
-			</div>
-			<a>Rent one bear, ...</a>
+	<ul id="navigation">
+		<li>
+			<a class="head" href="?p=1.1.1">Guitar</a>
+			<ul>
+				<li><a href="?p=1.1.1.1">Electric</a></li>
+				<li><a href="?p=1.1.1.2">Acoustic</a></li>
+				<li><a href="?p=1.1.1.3">Amps</a></li>
+				<li><a href="?p=1.1.1.4">Effects</a></li>
+				<li><a href="?p=1.1.1.5">Accessories</a></li>
+			</ul> 
+		</li>
+		<li>
+			<a class="head" href="?p=1.1.2"><span>Bass</span></a>
+			<ul>
+				<li><a href="?p=1.1.2.1">Electric</a></li>
+				<li><a href="?p=1.1.2.2">Acoustic</a></li>
+				<li><a href="?p=1.1.2.3">Amps</a></li>
+				<li><a href="?p=1.1.2.4">Effects</a></li>
+				<li><a href="?p=1.1.2.5">Accessories</a></li>
+				<li><a href="?p=1.1.2.5">Accessories</a></li>
+				<li><a href="?p=1.1.2.5">Accessories</a></li>
+			</ul> 
+		</li>
+		<li>
+			<a class="head" href="?p=1.1.3">Drums</a>
+			<ul>
+				<li><a href="?p=1.1.3.2">Acoustic Drums</a></li>
+				<li><a href="?p=1.1.3.3">Electronic Drums</a></li>
+				<li><a href="?p=1.1.3.6">Accessories</a></li>
+			</ul> 
+		</li>
+	</ul>
+	<dl id="list2">
+		<dt class="red">Red</dt>
+		<dd>
+			Fancy stuff about red thingies.
+		</dd>
+		<dt class="green selected">Green</dt>
+		<dd>
+			Green! Green! Green!
+		</dd>
+		<dt class="blue">Blue</dt>
+		<dd>
+			Cool kids are blue.
+		</dd>
+	</dl>
+	
+	<div id="list3">
+		<div>
+			<div class="title">Tennis</div>
 			<div>
-				<p>
-					get two for three beer.
-				</p>
-				<p>
-					And now, for something completely different.
-				</p>
+				One ball, two players. Lots of fun.
 			</div>
 		</div>
-		
-	</fieldset>
-	
-	<fieldset>
-		<legend>Navigation - Unordered List with anchors and nested lists.</legend>
-		<p>The first item is cloned to allow the user to select it. The
-		active element is choosen based on location.hash: Open Drums and click
-		the first item ('Drums'), then reload the page.</p>
-
-		<ul id="navigation">
-			<li>
-				<a class="head" href="?p=1.1.1">Guitar</a>
-				<ul>
-					<li><a href="?p=1.1.1.1">Electric</a></li>
-					<li><a href="?p=1.1.1.2">Acoustic</a></li>
-					<li><a href="?p=1.1.1.3">Amps</a></li>
-					<li><a href="?p=1.1.1.4">Effects</a></li>
-					<li><a href="?p=1.1.1.5">Accessories</a></li>
-				</ul> 
-			</li>
-			<li>
-				<a class="head" href="?p=1.1.2">Bass</a>
-				<ul>
-					<li><a href="?p=1.1.2.1">Electric</a></li>
-					<li><a href="?p=1.1.2.2">Acoustic</a></li>
-					<li><a href="?p=1.1.2.3">Amps</a></li>
-					<li><a href="?p=1.1.2.4">Effects</a></li>
-					<li><a href="?p=1.1.2.5">Accessories</a></li>
-					<li><a href="?p=1.1.2.5">Accessories</a></li>
-					<li><a href="?p=1.1.2.5">Accessories</a></li>
-				</ul> 
-			</li>
-			<li>
-				<a class="head" href="?p=1.1.3">Drums</a>
-				<ul>
-					<li><a href="?p=1.1.3.2">Acoustic Drums</a></li>
-					<li><a href="?p=1.1.3.3">Electronic Drums</a></li>
-					<li><a href="?p=1.1.3.6">Accessories</a></li>
-				</ul> 
-			</li>
-		</ul>
-		
-	</fieldset>
-
-	<fieldset>
-		<legend>With options, container is a definition list, header dt, content dd</legend>
-		
-		<dl id="list2">
-			<dt class="red">Red</dt>
-			<dd>
-				Fancy stuff about red thingies.
-			</dd>
-			<dt class="green selected">Green</dt>
-			<dd>
-				Green! Green! Green!
-			</dd>
-			<dt class="blue">Blue</dt>
-			<dd>
-				Cool kids are blue.
-			</dd>
-		</dl>
-		
-	</fieldset>
-
-	<fieldset>
-		<legend>Divitus structure, div container, div header (class title), div
-		content, no active on startup and can be completely closed</legend>
-
-		<div id="list3">
+		<div>
+			<div class="title">Soccer</div>
 			<div>
-				<div class="title">Tennis</div>
-				<div>
-					One ball, two players. Lots of fun.
-				</div>
+				One ball, 22 players. Lots of fun.
 			</div>
+		</div>
+		<div>
+			<div class="title">Baseball</div>
 			<div>
-				<div class="title">Soccer</div>
-				<div>
-					One ball, 22 players. Lots of fun.
-				</div>
+				Well, one ball, some guys running around, some guys hitting others with a stick.<br/>
+				Sounds like fun, doesn't it?
 			</div>
 			<div>
-				<div class="title">Baseball</div>
-				<div>
-					Well, one ball, some guys running around, some guys hitting others with a stick.<br/>
-					Sounds like fun, doesn't it?
-				</div>
-				<div>
-					Well, apart from the running part.
-				</div>
+				Well, apart from the running part.
 			</div>
 		</div>
-		
-	</fieldset>
-		
-		<div id="switch">
-			<select>
-				<option>Switch to...</option>
-				<option value="1">1</option>
-				<option value="2">2</option>
-				<option value="3">3</option>
-			</select>
-			<button id="close">Close all</button>
-			Activate via selector, eg. ':first' or 'a:first': <input id="switch2" />
-		</div>
-
-		<div id="log"><div><strong>Log of the 2nd accordion</strong></div></div>
+	</div>
 
 	<div id="resizable1" style="background: green; width: 100px; height: 100px;">I'm a resizable.</div>
 	<img src="images/test.jpg" id="resizable2" style="width: 100px; height: 100px;"/>