Accordion: handle active: null. Fixes #8694: 1.9 Accordion - active: …

…null allows panels to be collapsible.
jquery · Oct 18, 2012 · c2802d7 · c2802d7
1 parent 390510c
commit c2802d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
@@ -13,6 +13,15 @@ test( "{ active: default }", function() {
 	state( element, 1, 0, 0 );
 });
 
+test( "{ active: null }", function() {
+	expect( 2 );
+	var element = $( "#list1" ).accordion({
+		active: null
+	});
+	equal( element.accordion( "option", "active" ), 0 );
+	state( element, 1, 0, 0 );
+});
+
 test( "{ active: false }", function() {
 	expect( 7 );
 	var element = $( "#list1" ).accordion({

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
@@ -59,8 +59,8 @@ $.widget( "ui.accordion", {
 			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
 			.hide();
 
-		// don't allow collapsible: false and active: false
-		if ( !options.collapsible && options.active === false ) {
+		// don't allow collapsible: false and active: false / null
+		if ( !options.collapsible && ( !options.active || typeof options.active !== "number" ) ) {
 			options.active = 0;
 		}
 		// handle negative values