Accordion: Maintain collapsed state on refresh. Fixes #9189 - Accordion: refresh() method incorrectly opens collapsed accordion.

scottgonzalez · scottgonzalez · commit 5a8596cdf3ba · 2013-03-27T15:23:59.000-04:00
diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.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() {
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
@@ -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 ] ) ) {
