Accordion: Moved handling for programmatically collapsing the accordion out of the...

diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index 5793e46d012d870b59d2e86cc33257d17d6732c0..4798f7404671c4998fe1c8449d83c1fbcb225c47 100644 (file)
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -24,7 +24,7 @@ test("accordionchange event, open closed and close again", function() {
                equals( ui.newHeader.size(), 0 );
                equals( ui.newContent.size(), 0 );
        })
-       .accordion("option", "active", 0);
+       .accordion("option", "active", false);
 });
 
 })(jQuery);

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index eb6cdb5d0f6ffddb7fa7cdab8d3b781b2567e6a2..61587ac00a82aab7d9931de48929486fe2ed1086 100644 (file)
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -277,14 +277,37 @@ $.widget( "ui.accordion", {
 
        _activate: function( index ) {
                var active = this._findActive( index )[ 0 ];
-               if ( !active ) {
-                       if ( !this.options.collapsible ) {
-                               return;
+
+               // 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 } );
                        }
-                       index = false;
+                       return;
                }
-               this.options.active = index;
-               this._eventHandler( { target: active, currentTarget: active } );
+
+               // no header to activate, check if we can collapse
+               if ( !this.options.collapsible ) {
+                       return;
+               }
+
+               this.active
+                       .removeClass( "ui-state-active ui-corner-top" )
+                       .addClass( "ui-state-default ui-corner-all" )
+                       .children( ".ui-icon" )
+                               .removeClass( this.options.icons.activeHeader )
+                               .addClass( this.options.icons.header );
+               this.active.next().addClass( "ui-accordion-content-active" );
+               var toHide = this.active.next(),
+                       data = {
+                               options: this.options,
+                               newHeader: $( [] ),
+                               oldHeader: this.active,
+                               newContent: $( [] ),
+                               oldContent: toHide
+                       },
+                       toShow = ( this.active = $( [] ) );
+               this._toggle( toShow, toHide, data );
        },
 
        // TODO: add tests/docs for negative values in 2.0 (#6854)
@@ -293,51 +316,23 @@ $.widget( "ui.accordion", {
        },
 
        _eventHandler: function( event ) {
-               var options = this.options;
+               var options = this.options,
+                       clicked = $( event.currentTarget ),
+                       clickedIsActive = clicked[0] === this.active[0];
+
                if ( options.disabled ) {
                        return;
                }
 
-               // called only when using activate(false) to close all parts programmatically
-               if ( !event.target ) {
-                       if ( !options.collapsible ) {
-                               return;
-                       }
-                       this.active
-                               .removeClass( "ui-state-active ui-corner-top" )
-                               .addClass( "ui-state-default ui-corner-all" )
-                               .children( ".ui-icon" )
-                                       .removeClass( options.icons.activeHeader )
-                                       .addClass( options.icons.header );
-                       this.active.next().addClass( "ui-accordion-content-active" );
-                       var toHide = this.active.next(),
-                               data = {
-                                       options: options,
-                                       newHeader: $( [] ),
-                                       oldHeader: options.active,
-                                       newContent: $( [] ),
-                                       oldContent: toHide
-                               },
-                               toShow = ( this.active = $( [] ) );
-                       this._toggle( toShow, toHide, data );
+               // if animations are still active, or the active header is the target, ignore click
+               if ( this.running || ( !options.collapsible && clickedIsActive ) ) {
                        return;
                }
 
-               // get the click target
-               var clicked = $( event.currentTarget ),
-                       clickedIsActive = clicked[0] === this.active[0];
-
-               // TODO the option is changed, is that correct?
-               // TODO if it is correct, shouldn't that happen after determining that the click is valid?
                options.active = options.collapsible && clickedIsActive ?
                        false :
                        this.headers.index( clicked );
 
-               // if animations are still active, or the active header is the target, ignore click
-               if ( this.running || ( !options.collapsible && clickedIsActive ) ) {
-                       return;
-               }
-
                // find elements to show and hide
                var active = this.active,
                        toShow = clicked.next(),
@@ -374,8 +369,6 @@ $.widget( "ui.accordion", {
                                .next()
                                .addClass( "ui-accordion-content-active" );
                }
-
-               return;
        },
 
        _toggle: function( toShow, toHide, data, clickedIsActive, down ) {