library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-10-05 01:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Accordion: Pass original event in beforeActivate event.

Browse Source
This commit is contained in:
Scott González 2011-04-04 11:53:19 -04:00
parent 01b92ff1a0
commit 80b6de1b78
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/accordion/accordion_events.js
View File

@ -3,7 +3,7 @@
module( "accordion: events", accordionSetupTeardown() );
test( "beforeActivate", function() {
expect( 42 );
expect( 47 );
var ac = $( "#list1" ).accordion({
active: false,
collapsible: true
@ -12,6 +12,7 @@ test( "beforeActivate", function() {
var content = ac.find( ".ui-accordion-content" );
ac.one( "accordionbeforeactivate", function( event, ui ) {
ok( !( "originalEvent" in event ) );
equals( ui.oldHeader.size(), 0 );
equals( ui.oldContent.size(), 0 );
equals( ui.newHeader.size(), 1 );
@ -24,6 +25,7 @@ test( "beforeActivate", function() {
state( ac, 1, 0, 0 );
ac.one( "accordionbeforeactivate", function( event, ui ) {
equals( event.originalEvent.type, "click" );
equals( ui.oldHeader.size(), 1 );
strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
equals( ui.oldContent.size(), 1 );
@ -38,6 +40,7 @@ test( "beforeActivate", function() {
state( ac, 0, 1, 0 );
ac.one( "accordionbeforeactivate", function( event, ui ) {
ok( !( "originalEvent" in event ) );
equals( ui.oldHeader.size(), 1 );
strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
equals( ui.oldContent.size(), 1 );
@ -50,6 +53,7 @@ test( "beforeActivate", function() {
state( ac, 0, 0, 0 );
ac.one( "accordionbeforeactivate", function( event, ui ) {
ok( !( "originalEvent" in event ) );
equals( ui.oldHeader.size(), 0 );
equals( ui.oldContent.size(), 0 );
equals( ui.newHeader.size(), 1 );
@ -63,6 +67,7 @@ test( "beforeActivate", function() {
state( ac, 0, 0, 0 );
ac.one( "accordionbeforeactivate", function( event, ui ) {
equals( event.originalEvent.type, "click" );
equals( ui.oldHeader.size(), 0 );
equals( ui.oldContent.size(), 0 );
equals( ui.newHeader.size(), 1 );

2
ui/jquery.ui.accordion.js vendored
View File

@ -319,7 +319,7 @@ $.widget( "ui.accordion", {
// click on active header, but not collapsible
( clickedIsActive && !options.collapsible ) ||
// allow canceling activation
( this._trigger( "beforeActivate", null, eventData ) === false ) ) {
( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
return;
}