From: Scott González Date: Mon, 27 Feb 2012 02:54:05 +0000 (-0500) Subject: Accordion: Don't toggle icons if the accordion doesn't have icons. X-Git-Tag: 1.9m7~35 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7f533dfb44f9d6807a5526aa7554f0806c544b69;p=jquery-ui.git Accordion: Don't toggle icons if the accordion doesn't have icons. --- diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 8731c17ca..00acf2d10 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -347,17 +347,23 @@ $.widget( "ui.accordion", { // switch classes active .removeClass( "ui-accordion-header-active ui-state-active ui-corner-top" ) - .addClass( "ui-corner-all" ) - .children( ".ui-accordion-header-icon" ) + .addClass( "ui-corner-all" ); + if ( options.icons ) { + active.children( ".ui-accordion-header-icon" ) .removeClass( options.icons.activeHeader ) .addClass( options.icons.header ); + } + if ( !clickedIsActive ) { clicked .removeClass( "ui-corner-all" ) - .addClass( "ui-accordion-header-active ui-state-active ui-corner-top" ) - .children( ".ui-accordion-header-icon" ) + .addClass( "ui-accordion-header-active ui-state-active ui-corner-top" ); + if ( options.icons ) { + clicked.children( ".ui-accordion-header-icon" ) .removeClass( options.icons.header ) .addClass( options.icons.activeHeader ); + } + clicked .next() .addClass( "ui-accordion-content-active" );