Navigation Menu

Skip to content

Commit

Permalink
Accordion: set aria-selected to true on selected header, false on oth…
Browse files Browse the repository at this point in the history
…ers. Fixed #7078 - Accordion: Set aria-selected
  • Loading branch information
rdworth committed Mar 15, 2011
1 parent 6bbc431 commit 69ebdf4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
6 changes: 5 additions & 1 deletion tests/unit/accordion/accordion_core.js
Expand Up @@ -14,7 +14,7 @@ test("handle click on header-descendant", function() {
});

test("accessibility", function () {
expect(9);
expect(13);
var ac = $('#list1').accordion().accordion("activate", 1);
var headers = $(".ui-accordion-header");

Expand All @@ -25,9 +25,13 @@ test("accessibility", function () {
equals( headers.next().attr("role"), "tabpanel", "tabpanel roles");
equals( headers.eq(1).attr("aria-expanded"), "true", "active tab has aria-expanded");
equals( headers.eq(0).attr("aria-expanded"), "false", "inactive tab has aria-expanded");
equals( headers.eq(1).attr("aria-selected"), "true", "active tab has aria-selected");
equals( headers.eq(0).attr("aria-selected"), "false", "inactive tab has aria-selected");
ac.accordion("activate", 0);
equals( headers.eq(0).attr("aria-expanded"), "true", "newly active tab has aria-expanded");
equals( headers.eq(1).attr("aria-expanded"), "false", "newly inactive tab has aria-expanded");
equals( headers.eq(0).attr("aria-selected"), "true", "active tab has aria-selected");
equals( headers.eq(1).attr("aria-selected"), "false", "inactive tab has aria-selected");
});

})(jQuery);
5 changes: 5 additions & 0 deletions ui/jquery.ui.accordion.js
Expand Up @@ -114,6 +114,7 @@ $.widget( "ui.accordion", {
.not( self.active || "" )
.attr({
"aria-expanded": "false",
"aria-selected": "false",
tabIndex: -1
})
.next()
Expand All @@ -126,6 +127,7 @@ $.widget( "ui.accordion", {
self.active
.attr({
"aria-expanded": "true",
"aria-selected": "true",
tabIndex: 0
});
}
Expand Down Expand Up @@ -173,6 +175,7 @@ $.widget( "ui.accordion", {
.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( "aria-selected" )
.removeAttr( "tabIndex" );

this.headers.find( "a" ).removeAttr( "tabIndex" );
Expand Down Expand Up @@ -477,12 +480,14 @@ $.widget( "ui.accordion", {
toHide.prev()
.attr({
"aria-expanded": "false",
"aria-selected": "false",
tabIndex: -1
})
.blur();
toShow.prev()
.attr({
"aria-expanded": "true",
"aria-selected": "true",
tabIndex: 0
})
.focus();
Expand Down

0 comments on commit 69ebdf4

Please sign in to comment.