accordion: fixed incosistent accordionchange event arguments (http://dev.jquery.com/ticket/3111)

1 files changed, 3 insertions, 4 deletions

diff --git a/ui/ui.accordion.js b/ui/ui.accordion.js
index 2cf014b8e..4865c317e 100644
--- a/ui/ui.accordion.js
+++ b/ui/ui.accordion.js
@@ -201,12 +201,11 @@ function clickHandler(event) {
 	// find elements to show and hide
 	var toShow = clicked.next(),
 		toHide = options.active.next(),
-		//data = [clicked, options.active, toShow, toHide],
 		data = {
 			options: options,
-			newHeader: clicked,
+			newHeader: clickedActive && !options.alwaysOpen ? $([]) : clicked,
 			oldHeader: options.active,
-			newContent: toShow,
+			newContent: clickedActive && !options.alwaysOpen ? $([]) : toShow,
 			oldContent: toHide
 		},
 		down = options.headers.index( options.active[0] ) > options.headers.index( clicked[0] );
@@ -218,7 +217,7 @@ function clickHandler(event) {
 };
 
 function findActive(headers, selector) {
-	return selector != undefined
+	return selector
 		? typeof selector == "number"
 			? headers.filter(":eq(" + selector + ")")
 			: headers.not(headers.not(selector))