Accordion: Handle changing the event option. Fixes #6740 - Dynamically changing accordion's event handler doesn't actually change the behaviour.

1 files changed, 13 insertions, 4 deletions

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 1c30ba89b..8049868e8 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -96,10 +96,7 @@ $.widget( "ui.accordion", {
 			self.headers.find( "a" ).attr( "tabIndex", -1 );
 		}
 
-		if ( options.event ) {
-			self.headers.bind( options.event.split( " " ).join( ".accordion " ) + ".accordion",
-				$.proxy( self, "_eventHandler" ) );
-		}
+		this._setupEvents( options.event );
 	},
 
 	_createIcons: function() {
@@ -164,6 +161,10 @@ $.widget( "ui.accordion", {
 			this._activate( 0 );
 		}
 
+		if ( key === "event" ) {
+			this._setupEvents( value );
+		}
+
 		if ( key === "icons" ) {
 			this._destroyIcons();
 			if ( value ) {
@@ -284,6 +285,14 @@ $.widget( "ui.accordion", {
 		return typeof selector === "number" ? this.headers.eq( selector ) : $();
 	},
 
+	_setupEvents: function( event ) {
+		this.headers.unbind( ".accordion" );
+		if ( event ) {
+			this.headers.bind( event.split( " " ).join( ".accordion " ) + ".accordion",
+				$.proxy( this, "_eventHandler" ) );
+		}
+	},
+
 	_eventHandler: function( event ) {
 		var options = this.options,
 			active = this.active,