Skip to content
Permalink
Browse files

Accordion: Fixed destroy method with new markup.

  • Loading branch information
scottgonzalez committed Jan 30, 2009
1 parent 902c191 commit 967d6595a6387e74f3fb2f87233d0f82e2f4d8c7
Showing with 49 additions and 57 deletions.
  1. +33 −39 tests/unit/accordion/accordion.html
  2. +15 −15 tests/unit/accordion/accordion.js
  3. +1 −3 ui/ui.accordion.js
@@ -19,47 +19,41 @@
<div id="main">

<div id="list1">
<div>
<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>
</div>
<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>
</div>
<div>
<a>Rent one bear, ...</a>
<div>
<p>
get two for three beer.
</p>
<p>
And now, for something completely different.
</p>
</div>
</div>
<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>

<ul id="navigation">
<li><a href="?p=1.1.1">Guitar</a></li>
<li>
<a 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>
@@ -68,8 +62,8 @@
<li><a href="?p=1.1.1.5">Accessories</a></li>
</ul>
</li>
<li><a href="?p=1.1.2"><span>Bass</span></a></li>
<li>
<a 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>
@@ -80,8 +74,8 @@
<li><a href="?p=1.1.2.5">Accessories</a></li>
</ul>
</li>
<li><a href="?p=1.1.3">Drums</a></li>
<li>
<a 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>
@@ -24,13 +24,13 @@ test("basics", function() {

test("autoHeight", function() {
$('#navigation').accordion({ autoHeight: false });
equals( 90, $('#navigation div:first').height() );
equals( 126, $('#navigation div:eq(1)').height() );
equals( 54, $('#navigation div:last').height() );
equals( $('#navigation > li:eq(1)').height(), 90 );
equals( $('#navigation > li:eq(3)').height(), 126 );
equals( $('#navigation > li:eq(5)').height(), 54 );
$('#navigation').accordion("destroy").accordion({ autoHeight: true });
equals( 126, $('#navigation div:first').height() );
equals( 126, $('#navigation div:eq(1)').height() );
equals( 126, $('#navigation div:last').height() );
equals( $('#navigation > li:eq(1)').height(), 126 );
equals( $('#navigation > li:eq(3)').height(), 126 );
equals( $('#navigation > li:eq(5)').height(), 126 );
});

test("activate, numeric", function() {
@@ -94,7 +94,7 @@ function state2(accordion) {
}

test("handle click on header-descendant", function() {
var ac = $('#navigation').accordion({ autoHeight: false })
var ac = $('#navigation').accordion({ autoHeight: false });
ac.triggerEvent("click", $('#navigation span:contains(Bass)')[0]);
state2(ac, 0, 1, 0);
});
@@ -114,17 +114,17 @@ test("accordionchange event, open closed and close again", function() {
alwaysOpen: false
})
.one("accordionchange", function(event, ui) {
equals( ui.oldHeader.size(), 0 )
equals( ui.oldContent.size(), 0 )
equals( ui.newHeader.size(), 1 )
equals( ui.newContent.size(), 1 )
equals( ui.oldHeader.size(), 0 );
equals( ui.oldContent.size(), 0 );
equals( ui.newHeader.size(), 1 );
equals( ui.newContent.size(), 1 );
})
.accordion("activate", 0)
.one("accordionchange", function(event, ui) {
equals( ui.oldHeader.size(), 1 )
equals( ui.oldContent.size(), 1 )
equals( ui.newHeader.size(), 0 )
equals( ui.newContent.size(), 0 )
equals( ui.oldHeader.size(), 1 );
equals( ui.oldContent.size(), 1 );
equals( ui.newHeader.size(), 0 );
equals( ui.newContent.size(), 0 );
})
.accordion("activate", 0);
});
@@ -105,9 +105,7 @@ $.widget("ui.accordion", {

this.headers.find("a").removeAttr("tabindex");
this.headers.children(".ui-icon").remove();
this.headers.next().removeClass("ui-accordion-content ui-accordion-content-active").each(function() {
$(this).parent().replaceWith(this);
});
this.headers.next().removeClass("ui-accordion-content ui-accordion-content-active");

},

0 comments on commit 967d659

Please sign in to comment.
You can’t perform that action at this time.