Skip to content
Permalink
Browse files

Accordion: Don't stop propagation when clicking in headers. Fixes #47…

…32 - accordion steals header clicks.
  • Loading branch information
scottgonzalez committed Jul 31, 2009
1 parent c0ba6cc commit 4f03ac24fd67c8e049cb93d49825212e5e501d90
Showing with 10 additions and 6 deletions.
  1. +10 −6 ui/ui.accordion.js
@@ -101,7 +101,10 @@ $.widget("ui.accordion", {
this.headers.find('a').attr('tabIndex','-1');

if (o.event) {
this.headers.bind((o.event) + ".accordion", function(event) { return self._clickHandler.call(self, event, this); });
this.headers.bind((o.event) + ".accordion", function(event) {
self._clickHandler.call(self, event, this);
event.preventDefault();
});
}

},
@@ -181,7 +184,8 @@ $.widget("ui.accordion", {
break;
case keyCode.SPACE:
case keyCode.ENTER:
return this._clickHandler({ target: event.target }, event.target);
this._clickHandler({ target: event.target }, event.target);
event.preventDefault();
}

if (toFocus) {
@@ -246,7 +250,7 @@ $.widget("ui.accordion", {
_clickHandler: function(event, target) {

var o = this.options;
if (o.disabled) return false;
if (o.disabled) { return; }

// called only when using activate(false) to close all parts programmatically
if (!event.target && o.collapsible) {
@@ -263,7 +267,7 @@ $.widget("ui.accordion", {
},
toShow = (this.active = $([]));
this._toggle(toShow, toHide, data);
return false;
return;
}

// get the click target
@@ -272,7 +276,7 @@ $.widget("ui.accordion", {

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

// switch classes
@@ -299,7 +303,7 @@ $.widget("ui.accordion", {
this.active = clickedIsActive ? $([]) : clicked;
this._toggle(toShow, toHide, data, clickedIsActive, down);

return false;
return;

},

0 comments on commit 4f03ac2

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