Accordion: Update activate and beforeActivate event properties to newPanel/oldPanel...

diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index 079c71a6207ea14d968d092dedb203b1df2878c0..b67f2b26d803d14e2b1bf91f7313b6624041a30f 100644 (file)
--- 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 0f14557905db8e4ae55d05ec7f7ee95f0095367e..856b3ba4bdb1b1b1313038636cee7f4b286d938d 100644 (file)
--- 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;
                };