Author: scott.gonzalez
Date: Thu Jan 29 19:27:44 2009
New Revision: 1885
Modified:
trunk/tests/unit/accordion/accordion.html
trunk/tests/unit/accordion/accordion.js
trunk/ui/ui.accordion.js
Log:
Accordion: Fixed destroy method with new markup.
Modified: trunk/tests/unit/accordion/accordion.html
==============================================================================
--- trunk/tests/unit/accordion/accordion.html (original)
+++ trunk/tests/unit/accordion/accordion.html Thu Jan 29 19:27:44 2009
@@ -19,47 +19,41 @@
<div id="main">
<div id="list1">
- <div>
- <a>There is one obvious advantage:</a>
- <div>
-
- 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.
-
- </div>
- </div>
- <div>
- <a>Now that you've got...</a>
- <div>
-
- your bear, you have to admit it!
- <br/>
- No, we aren't selling bears.
-
-
- We could talk about renting one.
-
- </div>
- </div>
- <div>
- <a>Rent one bear, ...</a>
- <div>
-
- get two for three beer.
-
-
- And now, for something completely different.
-
- </div>
- </div>
+ <a>There is one obvious advantage:</a>
+ <div>
+
+ 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.
+
+ </div>
+ <a>Now that you've got...</a>
+ <div>
+
+ your bear, you have to admit it!
+ <br/>
+ No, we aren't selling bears.
+
+
+ We could talk about renting one.
+
+ </div>
+ <a>Rent one bear, ...</a>
+ <div>
+
+ get two for three beer.
+
+
+ And now, for something completely different.
+
+ </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>
Modified: trunk/tests/unit/accordion/accordion.js
==============================================================================
--- trunk/tests/unit/accordion/accordion.js (original)
+++ trunk/tests/unit/accordion/accordion.js Thu Jan 29 19:27:44 2009
@@ -24,13 +24,13 @@
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 @@
}
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 @@
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);
});
Modified: trunk/ui/ui.accordion.js
==============================================================================
--- trunk/ui/ui.accordion.js (original)
+++ trunk/ui/ui.accordion.js Thu Jan 29 19:27:44 2009
@@ -105,9 +105,7 @@
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");
},