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

This commit is contained in:
Jörn Zaefferer 2008-06-21 16:16:59 +00:00
parent 9196c2022c
commit 2e3b8eac77
4 changed files with 212 additions and 272 deletions

View File

@ -33,145 +33,108 @@
<div id="main" style="position:absolute;top:-2000000px;"> <div id="main" style="position:absolute;top:-2000000px;">
<fieldset> <div id="list1">
<legend>Standard, container is a div, header is h3 and content p</legend> <a>There is one obvious advantage:</a>
<div>
<div id="list1"> <p>
<a>There is one obvious advantage:</a> You've seen it coming!<br/>
<div> Buy now and get nothing for free!<br/>
<p> Well, at least no free beer. Perhaps a bear, if you can afford it.
You've seen it coming!<br/> </p>
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>
<a>Now that you've got...</a>
</fieldset> <div>
<p>
<fieldset> your bear, you have to admit it!<br/>
<legend>Navigation - Unordered List with anchors and nested lists.</legend> No, we aren't selling bears.
<p>The first item is cloned to allow the user to select it. The </p>
active element is choosen based on location.hash: Open Drums and click <p>
the first item ('Drums'), then reload the page.</p> We could talk about renting one.
</p>
<ul id="navigation"> </div>
<li> <a>Rent one bear, ...</a>
<a class="head" href="?p=1.1.1">Guitar</a> <div>
<ul> <p>
<li><a href="?p=1.1.1.1">Electric</a></li> get two for three beer.
<li><a href="?p=1.1.1.2">Acoustic</a></li> </p>
<li><a href="?p=1.1.1.3">Amps</a></li> <p>
<li><a href="?p=1.1.1.4">Effects</a></li> And now, for something completely different.
<li><a href="?p=1.1.1.5">Accessories</a></li> </p>
</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">Tennis</div>
<div>
One ball, two players. Lots of fun.
</div>
</div>
<div>
<div class="title">Soccer</div>
<div>
One ball, 22 players. Lots of fun.
</div>
</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>
</div>
</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>
<div id="log"><div><strong>Log of the 2nd accordion</strong></div></div> <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>
One ball, two players. Lots of fun.
</div>
</div>
<div>
<div class="title">Soccer</div>
<div>
One ball, 22 players. Lots of fun.
</div>
</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>
</div>
</div>
</div> </div>
</body> </body>

View File

@ -10,10 +10,14 @@ jQuery.ui.accordion.defaults.animated = false;
function state(accordion) { function state(accordion) {
var args = $.makeArray(arguments).slice(1); var args = $.makeArray(arguments).slice(1);
$.each(args, function(i, n) { $.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() { test("basics", function() {
state($('#list1').accordion(), 1, 0, 0); state($('#list1').accordion(), 1, 0, 0);
}); });
@ -82,4 +86,17 @@ test("activate, jQuery or DOM element", function() {
state(ac, 0, 1, 0); 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); })(jQuery);

View File

@ -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 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> </div>
<fieldset> <div id="list1">
<legend>Standard, container is a div, header is h3 and content p</legend> <a>There is one obvious advantage:</a>
<div>
<div id="list1"> <p>
<a>There is one obvious advantage:</a> You've seen it coming!<br/>
<div> Buy now and get nothing for free!<br/>
<p> Well, at least no free beer. Perhaps a bear, if you can afford it.
You've seen it coming!<br/> </p>
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>
<a>Now that you've got...</a>
</fieldset> <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>
<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>
<fieldset> <div id="list3">
<legend>Navigation - Unordered List with anchors and nested lists.</legend> <div>
<p>The first item is cloned to allow the user to select it. The <div class="title">Tennis</div>
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>
<div class="title">Tennis</div> One ball, two players. Lots of fun.
<div>
One ball, two players. Lots of fun.
</div>
</div>
<div>
<div class="title">Soccer</div>
<div>
One ball, 22 players. Lots of fun.
</div>
</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>
</div> </div>
</div> </div>
<div>
</fieldset> <div class="title">Soccer</div>
<div>
<div id="switch"> One ball, 22 players. Lots of fun.
<select> </div>
<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>
<div>
<div id="log"><div><strong>Log of the 2nd accordion</strong></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>
</div>
</div>
<div id="resizable1" style="background: green; width: 100px; height: 100px;">I'm a resizable.</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;"/> <img src="images/test.jpg" id="resizable2" style="width: 100px; height: 100px;"/>

View File

@ -180,9 +180,7 @@ function clickHandler(event) {
// due to the event delegation model, we have to check if one // due to the event delegation model, we have to check if one
// of the parent elements is our actual header, and find that // of the parent elements is our actual header, and find that
if ( clicked.parents(options.header).length ) { if ( clicked.parents(options.header).length ) {
while ( !clicked.is(options.header) ) { clicked = clicked.parents(options.header + ":first");
clicked = clicked.parent();
}
} }
var clickedActive = clicked[0] == options.active[0]; var clickedActive = clicked[0] == options.active[0];