From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 13 Jan 2011 21:45:21 +0000 (-0500)
Subject: Accordion: call event.preventDefault() inside the _eventHandler() instead of in each... 
X-Git-Tag: 1.9m4~65
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b22c69b949b6d807af0124fa481017bfff57f37b;p=jquery-ui.git

Accordion: call event.preventDefault() inside the _eventHandler() instead of in each individual event handler.
---

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 5fa4b1aee..8b7c1f3a4 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -119,10 +119,8 @@ $.widget( "ui.accordion", {
 		}
 
 		if ( options.event ) {
-			self.headers.bind( options.event.split(" ").join(".accordion ") + ".accordion", function(event) {
-				self._eventHandler( event );
-				event.preventDefault();
-			});
+			self.headers.bind( options.event.split(" ").join(".accordion ") + ".accordion",
+				$.proxy( self, "_eventHandler" ) );
 		}
 	},
 
@@ -217,7 +215,6 @@ $.widget( "ui.accordion", {
 			case keyCode.SPACE:
 			case keyCode.ENTER:
 				this._eventHandler( event );
-				event.preventDefault();
 		}
 
 		if ( toFocus ) {
@@ -281,7 +278,11 @@ $.widget( "ui.accordion", {
 		// we found a header to activate, just delegate to the event handler
 		if ( active ) {
 			if ( active !== this.active[ 0 ] ) {
-				this._eventHandler( { target: active, currentTarget: active } );
+				this._eventHandler({
+					target: active,
+					currentTarget: active,
+					preventDefault: $.noop
+				});
 			}
 			return;
 		}
@@ -320,6 +321,8 @@ $.widget( "ui.accordion", {
 			clicked = $( event.currentTarget ),
 			clickedIsActive = clicked[0] === this.active[0];
 
+		event.preventDefault();
+
 		if ( options.disabled ) {
 			return;
 		}