Accordion: Fixed key handling.

1 files changed, 7 insertions, 5 deletions

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 7602ae9bc..acd19c981 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -162,6 +162,13 @@ $.widget( "ui.accordion", {
 			return;
 		}
 
+		if ( key === "event" ) {
+			if ( this.options.event ) {
+				this.headers.unbind( this.options.event + ".accordion", this._eventHandler );
+			}
+			this._setupEvents( value );
+		}
+
 		this._super( "_setOption", key, value );
 
 		// setting collapsible: false while collapsed; open first panel
@@ -169,10 +176,6 @@ $.widget( "ui.accordion", {
 			this._activate( 0 );
 		}
 
-		if ( key === "event" ) {
-			this._setupEvents( value );
-		}
-
 		if ( key === "icons" ) {
 			this._destroyIcons();
 			if ( value ) {
@@ -294,7 +297,6 @@ $.widget( "ui.accordion", {
 	},
 
 	_setupEvents: function( event ) {
-		this.headers.unbind( ".accordion" );
 		if ( event ) {
 			this.headers.bind( event.split( " " ).join( ".accordion " ) + ".accordion",
 				$.proxy( this, "_eventHandler" ) );