Collapsible: fix the bug about collapsedIcon

allsteady · Gabriel Schulhof · commit fbbb29e465d2 · 2014-02-24T00:10:17.000+02:00
Closes gh-6708 Fixes gh-7089
diff --git a/js/widgets/collapsible.js b/js/widgets/collapsible.js
@@ -201,8 +201,11 @@ $.widget( "mobile.collapsible", {
 				if ( currentOpts.collapsedIcon ) {
 					anchor.removeClass( "ui-icon-" + currentOpts.collapsedIcon );
 				}
-				if ( opts.collapsedIcon ) {
-					anchor.addClass( "ui-icon-" + opts.collapsedIcon );
+				if ( /false/i.test( opts.collapsedIcon ) ) {
+					anchor.removeClass( "ui-btn-icon-" + ( currentOpts.iconPos === "right" ? "right" : "left" ) );
+				} else {
+					anchor.addClass( "ui-icon-" + opts.collapsedIcon )
+						.toggleClass( "ui-btn-icon-" + ( currentOpts.iconPos === "right" ? "right" : "left" ), true );
 				}
 			}
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -201,8 +201,11 @@ $.widget( "mobile.collapsible", {`
`201`	`201`	`if ( currentOpts.collapsedIcon ) {`
`202`	`202`	`anchor.removeClass( "ui-icon-" + currentOpts.collapsedIcon );`
`203`	`203`	`}`
`204`		`- if ( opts.collapsedIcon ) {`
`205`		`- anchor.addClass( "ui-icon-" + opts.collapsedIcon );`
	`204`	`+ if ( /false/i.test( opts.collapsedIcon ) ) {`
	`205`	`+ anchor.removeClass( "ui-btn-icon-" + ( currentOpts.iconPos === "right" ? "right" : "left" ) );`
	`206`	`+ } else {`
	`207`	`+ anchor.addClass( "ui-icon-" + opts.collapsedIcon )`
	`208`	`+ .toggleClass( "ui-btn-icon-" + ( currentOpts.iconPos === "right" ? "right" : "left" ), true );`
`206`	`209`	`}`
`207`	`210`	`}`
`208`	`211`	`} else {`