Skip to content

Commit f1ff9b8

Browse files
committed
Accordion: Added ui-accordion-header-icon class to generated icons in order to not interfere with any additional icons that users might add.
1 parent 002f9a2 commit f1ff9b8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

themes/base/jquery.ui.accordion.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
1414
.ui-accordion .ui-accordion-heading { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
1515
.ui-accordion-icons .ui-accordion-heading { padding-left: 2.2em; }
16-
.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
16+
.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
1717
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
1818
.ui-accordion .ui-accordion-content-active { display: block; }

ui/jquery.ui.accordion.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,17 @@ $.widget( "ui.accordion", {
9898
var icons = this.options.icons;
9999
if ( icons ) {
100100
$( "<span>" )
101-
.addClass( "ui-icon " + icons.header )
101+
.addClass( "ui-accordion-header-icon ui-icon " + icons.header )
102102
.prependTo( this.headers );
103-
this.active.children( ".ui-icon" )
103+
this.active.children( ".ui-accordion-header-icon" )
104104
.removeClass( icons.header )
105105
.addClass( icons.activeHeader );
106106
this.element.addClass( "ui-accordion-icons" );
107107
}
108108
},
109109

110110
_destroyIcons: function() {
111-
this.headers.children( ".ui-icon" ).remove();
111+
this.headers.children( ".ui-accordion-header-icon" ).remove();
112112
this.element.removeClass( "ui-accordion-icons" );
113113
},
114114

@@ -272,7 +272,7 @@ $.widget( "ui.accordion", {
272272
this.active
273273
.removeClass( "ui-state-active ui-corner-top" )
274274
.addClass( "ui-state-default ui-corner-all" )
275-
.children( ".ui-icon" )
275+
.children( ".ui-accordion-header-icon" )
276276
.removeClass( this.options.icons.activeHeader )
277277
.addClass( this.options.icons.header );
278278
this.active.next().addClass( "ui-accordion-content-active" );
@@ -345,14 +345,14 @@ $.widget( "ui.accordion", {
345345
active
346346
.removeClass( "ui-state-active ui-corner-top" )
347347
.addClass( "ui-state-default ui-corner-all" )
348-
.children( ".ui-icon" )
348+
.children( ".ui-accordion-header-icon" )
349349
.removeClass( options.icons.activeHeader )
350350
.addClass( options.icons.header );
351351
if ( !clickedIsActive ) {
352352
clicked
353353
.removeClass( "ui-state-default ui-corner-all" )
354354
.addClass( "ui-state-active ui-corner-top" )
355-
.children( ".ui-icon" )
355+
.children( ".ui-accordion-header-icon" )
356356
.removeClass( options.icons.header )
357357
.addClass( options.icons.activeHeader );
358358
clicked

0 commit comments

Comments
 (0)