From ab798cb4646cfeb79f1949eb70cd64813a248d87 Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 5 Jan 2015 15:44:49 -0500 Subject: Accordion: Set `aria-expanded` when collapsing Fixes #10703 Closes gh-1413 --- ui/accordion.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'ui') diff --git a/ui/accordion.js b/ui/accordion.js index ef1357b8e..e904df2be 100644 --- a/ui/accordion.js +++ b/ui/accordion.js @@ -488,7 +488,10 @@ return $.widget( "ui.accordion", { toHide.attr({ "aria-hidden": "true" }); - toHide.prev().attr( "aria-selected", "false" ); + toHide.prev().attr({ + "aria-selected": "false", + "aria-expanded": "false" + }); // if we're switching panels, remove the old header from the tab order // if we're opening from collapsed state, remove the previous header from the tab order // if we're collapsing, then keep the collapsing header in the tab order @@ -499,7 +502,7 @@ return $.widget( "ui.accordion", { }); } else if ( toShow.length ) { this.headers.filter(function() { - return $( this ).attr( "tabIndex" ) === 0; + return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0; }) .attr( "tabIndex", -1 ); } @@ -509,8 +512,8 @@ return $.widget( "ui.accordion", { .prev() .attr({ "aria-selected": "true", - tabIndex: 0, - "aria-expanded": "true" + "aria-expanded": "true", + tabIndex: 0 }); }, -- cgit v1.2.3