Skip to content
Permalink
Browse files

Fixed accordion option active getter and setter. Normalized getter to…

… number, 0-based index.
  • Loading branch information
rdworth committed Aug 11, 2009
1 parent 57e3595 commit 7b506cf2aecb8c8988b95b0e59b8593fd1c484bd
Showing with 20 additions and 1 deletion.
  1. +14 −1 tests/unit/accordion/accordion_options.js
  2. +6 −0 ui/ui.accordion.js
@@ -38,7 +38,20 @@ test("{ active: false }", function() {
});

test("{ active: Number }", function() {
ok(false, 'missing test - untested code is broken code');
expect(4);
$("#list1").accordion({
active: 0
});
equals( $("#list1").accordion('option', 'active'), 0);

$("#list1").accordion('option', 'active', 1);
equals( $("#list1").accordion('option', 'active'), 1);

$('.ui-accordion-header:eq(2)', '#list1').click();
equals( $("#list1").accordion('option', 'active'), 2);

$("#list1").accordion('activate', 0);
equals( $("#list1").accordion('option', 'active'), 0);
});

test("{ animated: false }, default", function() {
@@ -153,6 +153,9 @@ $.widget("ui.accordion", {

$.widget.prototype._setData.apply(this, arguments);

if (key == "active") {
this.activate(value);
}
if (key == "icons") {
this._destroyIcons();
if (value) {
@@ -230,6 +233,7 @@ $.widget("ui.accordion", {
},

activate: function(index) {
this.options.active = index;
// call clickHandler with custom event
var active = this._findActive(index)[0];
this._clickHandler({ target: active }, active);
@@ -273,6 +277,8 @@ $.widget("ui.accordion", {
// get the click target
var clicked = $(event.currentTarget || target);
var clickedIsActive = clicked[0] == this.active[0];

o.active = $('.ui-accordion-header', this.element).index(clicked);

// if animations are still active, or the active header is the target, ignore click
if (this.running || (!o.collapsible && clickedIsActive)) {

0 comments on commit 7b506cf

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