diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-03-19 19:59:31 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-03-19 19:59:31 +0100 |
| commit | 1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2 (patch) | |
| tree | 77edf8d66ab74aa11b86c286ba2a528b4d3c36de /ui/jquery.ui.accordion.js | |
| parent | 5a9a80f86cc7844e7357af834c61cc14431110d1 (diff) | |
| parent | 1c1f7c6184ba6f6a13e93960ea77c293f9d4308e (diff) | |
| download | jquery-ui-1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2.tar.gz jquery-ui-1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.accordion.js')
| -rw-r--r-- | ui/jquery.ui.accordion.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 1afa95cb4..c210a29a9 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -65,8 +65,7 @@ $.widget( "ui.accordion", { _getCreateEventData: function() { return { header: this.active, - panel: !this.active.length ? $() : this.active.next(), - content: !this.active.length ? $() : this.active.next() + panel: !this.active.length ? $() : this.active.next() }; }, @@ -161,6 +160,9 @@ $.widget( "ui.accordion", { // #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.element + .toggleClass( "ui-state-disabled", !!value ) + .attr( "aria-disabled", value ); this.headers.add( this.headers.next() ) .toggleClass( "ui-state-disabled", !!value ); } |