Permalink
Browse files

Accordion: Add disabled class to headers and panels to fix styling in…

… IE. Fixes #5332 - Accordion: Disabled accordion doesn't look disabled in IE.
  • Loading branch information...
1 parent 936a9a6 commit c71e63cb6907e4df994e6dfa2e52d3a2dfc19b2d @scottgonzalez scottgonzalez committed Jul 14, 2010
Showing with 11 additions and 7 deletions.
  1. +11 −7 ui/jquery.ui.accordion.js
View
@@ -144,23 +144,21 @@ $.widget("ui.accordion", {
this.element
.removeClass("ui-accordion ui-widget ui-helper-reset")
- .removeAttr("role")
- .unbind('.accordion')
- .removeData('accordion');
+ .removeAttr("role");
this.headers
.unbind(".accordion")
- .removeClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-corner-top")
+ .removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top")
.removeAttr("role").removeAttr("aria-expanded").removeAttr("tabIndex");
this.headers.find("a").removeAttr("tabIndex");
this._destroyIcons();
- var contents = this.headers.next().css("display", "").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active");
+ var contents = this.headers.next().css("display", "").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");
if (o.autoHeight || o.fillHeight) {
contents.css("height", "");
}
- return this;
+ return $.Widget.prototype.destroy.call( this );
},
_setOption: function(key, value) {
@@ -175,7 +173,13 @@ $.widget("ui.accordion", {
this._createIcons();
}
}
-
+ // #5332 - opacity doesn't cascade to positioned elements in IE
+ // so we need to add the disabled class to the headers and panels
+ if (key == "disabled") {
+ this.headers.add(this.headers.next())
+ [ value ? "addClass" : "removeClass"](
+ "ui-accordion-disabled ui-state-disabled" );
+ }
},
_keydown: function(event) {

0 comments on commit c71e63c

Please sign in to comment.