Permalink
Browse files

Accordion: Maintain collapsed state on refresh. Fixes #9189 - Accordi…

…on: refresh() method incorrectly opens collapsed accordion.

(cherry picked from commit 5a8596c)
  • Loading branch information...
scottgonzalez committed Mar 27, 2013
1 parent f9097a6 commit a93ad182c837ef6c46323092a5538355e7ee3a7c
Showing with 11 additions and 2 deletions.
  1. +10 −1 tests/unit/accordion/accordion_methods.js
  2. +1 −1 ui/jquery.ui.accordion.js
@@ -30,7 +30,7 @@ test( "enable/disable", function() {
});
test( "refresh", function() {
expect( 17 );
expect( 19 );
var element = $( "#navigation" )
.parent()
.height( 300 )
@@ -104,6 +104,15 @@ test( "refresh", function() {
element.find( "div.foo" ).eq( 0 ).remove();
element.accordion( "refresh" );
state( element, 1 );
// collapse all panels
element.accordion( "option", {
collapsible: true,
active: false
});
state( element, 0 );
element.accordion( "refresh" );
state( element, 0 );
});
test( "widget", function() {
@@ -221,7 +221,7 @@ $.widget( "ui.accordion", {
options.active = false;
this.active = $();
// active false only when collapsible is true
} if ( options.active === false ) {
} else if ( options.active === false ) {
this._activate( 0 );
// was active, but active panel is gone
} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {

0 comments on commit a93ad18

Please sign in to comment.