github/jquery-ui
1
1
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2026-04-20 03:02:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Accordion: Added ui-accordion-header-icon class to generated icons in order to not interfere with any additional icons that users might add.

Browse Source
This commit is contained in:
Scott González
2011-02-02 21:15:25 -05:00
parent 002f9a2629
commit f1ff9b8f4d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
themes/base/jquery.ui.accordion.css vendored
View File

@@ -13,6 +13,6 @@
.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
.ui-accordion .ui-accordion-heading { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
.ui-accordion-icons .ui-accordion-heading { padding-left: 2.2em; }
.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
.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; }
.ui-accordion .ui-accordion-content-active { display: block; }

12
ui/jquery.ui.accordion.js vendored
View File

@@ -98,9 +98,9 @@ $.widget( "ui.accordion", {
var icons = this.options.icons;
if ( icons ) {
$( "<span>" )
.addClass( "ui-icon " + icons.header )
.addClass( "ui-accordion-header-icon ui-icon " + icons.header )
.prependTo( this.headers );
this.active.children( ".ui-icon" )
this.active.children( ".ui-accordion-header-icon" )
.removeClass( icons.header )
.addClass( icons.activeHeader );
this.element.addClass( "ui-accordion-icons" );
@@ -108,7 +108,7 @@ $.widget( "ui.accordion", {
},
_destroyIcons: function() {
this.headers.children( ".ui-icon" ).remove();
this.headers.children( ".ui-accordion-header-icon" ).remove();
this.element.removeClass( "ui-accordion-icons" );
},
@@ -272,7 +272,7 @@ $.widget( "ui.accordion", {
this.active
.removeClass( "ui-state-active ui-corner-top" )
.addClass( "ui-state-default ui-corner-all" )
.children( ".ui-icon" )
.children( ".ui-accordion-header-icon" )
.removeClass( this.options.icons.activeHeader )
.addClass( this.options.icons.header );
this.active.next().addClass( "ui-accordion-content-active" );
@@ -345,14 +345,14 @@ $.widget( "ui.accordion", {
active
.removeClass( "ui-state-active ui-corner-top" )
.addClass( "ui-state-default ui-corner-all" )
.children( ".ui-icon" )
.children( ".ui-accordion-header-icon" )
.removeClass( options.icons.activeHeader )
.addClass( options.icons.header );
if ( !clickedIsActive ) {
clicked
.removeClass( "ui-state-default ui-corner-all" )
.addClass( "ui-state-active ui-corner-top" )
.children( ".ui-icon" )
.children( ".ui-accordion-header-icon" )
.removeClass( options.icons.header )
.addClass( options.icons.activeHeader );
clicked