From 7f533dfb44f9d6807a5526aa7554f0806c544b69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Scott=20Gonz=C3=A1lez?= Date: Sun, 26 Feb 2012 21:54:05 -0500 Subject: [PATCH] Accordion: Don't toggle icons if the accordion doesn't have icons. --- ui/jquery.ui.accordion.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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" ); -- 2.39.5