Permalink
Browse files

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

…on: refresh() method incorrectly opens collapsed accordion.
  • Loading branch information...
1 parent 2c43548 commit 5a8596cdf3baa4d835e588cda9060a0537236c71 @scottgonzalez scottgonzalez committed Mar 27, 2013
Showing with 11 additions and 2 deletions.
  1. +10 −1 tests/unit/accordion/accordion_methods.js
  2. +1 −1 ui/jquery.ui.accordion.js
@@ -35,7 +35,7 @@ test( "enable/disable", function() {
});
test( "refresh", function() {
- expect( 17 );
+ expect( 19 );
var element = $( "#navigation" )
.parent()
.height( 300 )
@@ -109,6 +109,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() {
@@ -223,7 +223,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 5a8596c

Please sign in to comment.