Collapsible: Handle icon-related option setting uniformly

js/widgets/collapsible.js

@@ -174,7 +174,7 @@ $.widget( "mobile.collapsible", {
 	},
 
 	_applyOptions: function( options ) {
-		var isCollapsed, newTheme, oldTheme, hasCorners,
+		var isCollapsed, newTheme, oldTheme, hasCorners, hasIcon,
 			elem = this.element,
 			currentOpts = this._renderedOptions,
 			ui = this._ui,
@@ -191,38 +191,61 @@ $.widget( "mobile.collapsible", {
 
 		isCollapsed = elem.hasClass( "ui-collapsible-collapsed" );
 
-		// Only options referring to the current state need to be applied right away
-		// It is enough to store options covering the alternate in this.options.
+		// We only need to apply the cue text for the current state right away.
+		// The cue text for the alternate state will be stored in the options
+		// and applied the next time the collapsible's state is toggled
 		if ( isCollapsed ) {
 			if ( opts.expandCueText !== undefined ) {
 				status.text( opts.expandCueText );
 			}
-			if ( opts.collapsedIcon !== undefined ) {
-				if ( currentOpts.collapsedIcon ) {
-					anchor.removeClass( "ui-icon-" + currentOpts.collapsedIcon );
-				}
-				if ( opts.collapsedIcon ) {
-					anchor.addClass( "ui-icon-" + opts.collapsedIcon );
-				}
-			}
 		} else {
 			if ( opts.collapseCueText !== undefined ) {
 				status.text( opts.collapseCueText );
 			}
-			if ( opts.expandedIcon !== undefined ) {
-				if ( currentOpts.expandedIcon ) {
-					anchor.removeClass( "ui-icon-" + currentOpts.expandedIcon );
-				}
-				if ( opts.expandedIcon ) {
-					anchor.addClass( "ui-icon-" + opts.expandedIcon );
-				}
-			}
 		}
 
-		if ( opts.iconpos !== undefined ) {
-			anchor
-				.removeClass( iconposClass( currentOpts.iconpos ) )
-				.addClass( iconposClass( opts.iconpos ) );
+		// Update icon
+
+		// Is it supposed to have an icon?
+		hasIcon =
+
+			// If the collapsedIcon is being set, consult that
+			( opts.collapsedIcon !== undefined ? opts.collapsedIcon !== false :
+
+				// Otherwise consult the existing option value
+				currentOpts.collapsedIcon !== false );
+
+
+		// If any icon-related options have changed, make sure the new icon
+		// state is reflected by first removing all icon-related classes
+		// reflecting the current state and then adding all icon-related
+		// classes for the new state
+		if ( !( opts.iconpos === undefined &&
+			opts.collapsedIcon === undefined &&
+			opts.expandedIcon === undefined ) ) {
+
+			// Remove all current icon-related classes
+			anchor.removeClass( [ iconposClass( currentOpts.iconpos ) ]
+				.concat( ( currentOpts.expandedIcon ?
+					[ "ui-icon-" + currentOpts.expandedIcon ] : [] ) )
+				.concat( ( currentOpts.collapsedIcon ?
+					[ "ui-icon-" + currentOpts.collapsedIcon ] : [] ) )
+				.join( " " ) );
+
+			// Add new classes if an icon is supposed to be present
+			if ( hasIcon ) {
+				anchor.addClass(
+					[ iconposClass( opts.iconpos !== undefined ?
+						opts.iconpos : currentOpts.iconpos ) ]
+						.concat( isCollapsed ?
+							[ "ui-icon-" + ( opts.collapsedIcon !== undefined ?
+								opts.collapsedIcon :
+								currentOpts.collapsedIcon ) ] :
+							[ "ui-icon-" + ( opts.expandedIcon !== undefined ?
+								opts.expandedIcon :
+								currentOpts.expandedIcon ) ] )
+						.join( " " ) );
+			}
 		}
 
 		if ( opts.theme !== undefined ) {

tests/integration/collapsible/collapsible_core.js

@@ -210,6 +210,29 @@
 
 	module( "Icons", {});
 
+	test( "expandedIcon behavior when collapsedIcon set to false", function() {
+		var collapsible = $( "#collapsible-collapsed-icon-false-expanded-icon" );
+		collapsible.collapsible( "expand" );
+		collapsible.collapsible( "option", "collapsedIcon", false );
+		deepEqual( collapsible.find( "a" ).hasClass( "ui-icon-minus" ),
+			false, "Turning off collapsedIcon makes expanded icon disappear" );
+		deepEqual( collapsible.find( "a" ).hasClass( "ui-btn-icon-left" ),
+			false, "Turning off collapsedIcon makes iconpos class disappear" );
+		collapsible.collapsible( "option", "collapsedIcon", "plus" );
+		deepEqual( collapsible.find( "a" ).hasClass( "ui-icon-minus" ),
+			true, "Turning on collapsedIcon makes expanded icon reappear" );
+		deepEqual( collapsible.find( "a" ).hasClass( "ui-btn-icon-left" ),
+			true, "Turning on collapsedIcon makes iconpos class reappear" );
+	});
+
+	test( "iconpos behavior when collapsedIcon set to false", function() {
+		var collapsible = $( "#collapsible-collapsed-icon-false-iconpos" );
+		collapsible.collapsible( "option", "collapsedIcon", false );
+		collapsible.collapsible( "option", "iconpos", "top" );
+		deepEqual( collapsible.find( "a" ).hasClass( "ui-btn-icon-top" ),
+			false, "Setting iconpos while collapsedIcon is off has no effect" );
+	});
+
 	test( "Collapsible with custom icons", function(){
 		var collapsibles = $( "#collapsible-with-custom-icons" ).find( ".ui-collapsible" );
 

tests/integration/collapsible/index.html

@@ -36,6 +36,14 @@
 
 	<div data-nstest-role="page">
 		<div data-nstest-role="content">
+			<div id="collapsible-collapsed-icon-false-expanded-icon" data-nstest-role="collapsible">
+				<h4>Header</h4>
+				<p>Contents</p>
+			</div>
+			<div id="collapsible-collapsed-icon-false-iconpos" data-nstest-role="collapsible">
+				<h4>Header</h4>
+				<p>Contents</p>
+			</div>
 			<div id="collapsible-iconpos-test" data-nstest-role="collapsible" data-nstest-iconpos="xyzzy">
 				<h4>Header</h4>
 				<p>Contents</p>