From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Wed, 30 May 2012 12:40:03 +0000 (+0200)
Subject: Accordion: Update activate and beforeActivate event properties to newPanel/oldPanel... 
X-Git-Tag: 1.9.0-beta.1~81
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e0fe788ee0c0c0d8d23f9d90b9acff713ba1302f;p=jquery-ui.git

Accordion: Update activate and beforeActivate event properties to newPanel/oldPanel (instead of content). Fixes #6840 and #6842
---

diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index 079c71a62..b67f2b26d 100644
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -56,11 +56,11 @@ test( "beforeActivate", function() {
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
 		equal( ui.oldHeader.length, 0 );
-		equal( ui.oldContent.length, 0 );
+		equal( ui.oldPanel.length, 0 );
 		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 0 ] );
 		state( element, 0, 0, 0 );
 	});
 	element.accordion( "option", "active", 0 );
@@ -70,12 +70,12 @@ test( "beforeActivate", function() {
 		equal( event.originalEvent.type, "click" );
 		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldContent.length, 1 );
-		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
+		equal( ui.oldPanel.length, 1 );
+		strictEqual( ui.oldPanel[ 0 ], content[ 0 ] );
 		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
 		state( element, 1, 0, 0 );
 	});
 	headers.eq( 1 ).click();
@@ -85,10 +85,10 @@ test( "beforeActivate", function() {
 		ok( !( "originalEvent" in event ) );
 		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldContent.length, 1 );
-		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
+		equal( ui.oldPanel.length, 1 );
+		strictEqual( ui.oldPanel[ 0 ], content[ 1 ] );
 		equal( ui.newHeader.length, 0 );
-		equal( ui.newContent.length, 0 );
+		equal( ui.newPanel.length, 0 );
 		state( element, 0, 1, 0 );
 	});
 	element.accordion( "option", "active", false );
@@ -97,11 +97,11 @@ test( "beforeActivate", function() {
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
 		equal( ui.oldHeader.length, 0 );
-		equal( ui.oldContent.length, 0 );
+		equal( ui.oldPanel.length, 0 );
 		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 2 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 2 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 2 ] );
 		event.preventDefault();
 		state( element, 0, 0, 0 );
 	});
@@ -120,33 +120,33 @@ test( "activate", function() {
 
 	element.one( "accordionactivate", function( event, ui ) {
 		equal( ui.oldHeader.length, 0 );
-		equal( ui.oldContent.length, 0 );
+		equal( ui.oldPanel.length, 0 );
 		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 0 ] );
 	});
 	element.accordion( "option", "active", 0 );
 
 	element.one( "accordionactivate", function( event, ui ) {
 		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldContent.length, 1 );
-		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
+		equal( ui.oldPanel.length, 1 );
+		strictEqual( ui.oldPanel[ 0 ], content[ 0 ] );
 		equal( ui.newHeader.length, 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
+		equal( ui.newPanel.length, 1 );
+		strictEqual( ui.newPanel[ 0 ], content[ 1 ] );
 	});
 	headers.eq( 1 ).click();
 
 	element.one( "accordionactivate", function( event, ui ) {
 		equal( ui.oldHeader.length, 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldContent.length, 1 );
-		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
+		equal( ui.oldPanel.length, 1 );
+		strictEqual( ui.oldPanel[ 0 ], content[ 1 ] );
 		equal( ui.newHeader.length, 0 );
-		equal( ui.newContent.length, 0 );
+		equal( ui.newPanel.length, 0 );
 	});
 	element.accordion( "option", "active", false );
 
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 0f1455790..856b3ba4b 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -389,9 +389,9 @@ $.widget( "ui.accordion", {
 			toHide = active.next(),
 			eventData = {
 				oldHeader: active,
-				oldContent: toHide,
+				oldPanel: toHide,
 				newHeader: collapsing ? $() : clicked,
-				newContent: toShow
+				newPanel: toShow
 			};
 
 		event.preventDefault();
@@ -437,8 +437,8 @@ $.widget( "ui.accordion", {
 	},
 
 	_toggle: function( data ) {
-		var toShow = data.newContent,
-			toHide = this.prevShow.length ? this.prevShow : data.oldContent;
+		var toShow = data.newPanel,
+			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
 
 		// handle activating a panel during the animation for another activation
 		this.prevShow.add( this.prevHide ).stop( true, true );
@@ -524,7 +524,7 @@ $.widget( "ui.accordion", {
 	},
 
 	_toggleComplete: function( data ) {
-		var toHide = data.oldContent;
+		var toHide = data.oldPanel;
 
 		toHide
 			.removeClass( "ui-accordion-content-active" )
@@ -676,9 +676,19 @@ if ( $.uiBackCompat !== false ) {
 			}
 
 			if ( type === "beforeActivate" ) {
-				ret = _trigger.call( this, "changestart", event, data );
+				ret = _trigger.call( this, "changestart", event, {
+					oldHeader: data.oldHeader,
+					oldContent: data.oldPanel,
+					newHeader: data.newHeader,
+					newContent: data.newPanel
+				});
 			} else if ( type === "activate" ) {
-				ret = _trigger.call( this, "change", event, data );
+				ret = _trigger.call( this, "change", event, {
+					oldHeader: data.oldHeader,
+					oldContent: data.oldPanel,
+					newHeader: data.newHeader,
+					newContent: data.newPanel
+				});
 			}
 			return ret;
 		};