diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/menu.js | 8 | ||||
| -rw-r--r-- | ui/selectmenu.js | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ui/menu.js b/ui/menu.js index 9c0954bea..bf698c9f9 100644 --- a/ui/menu.js +++ b/ui/menu.js @@ -372,9 +372,7 @@ return $.widget( "ui.menu", { this._scrollIntoView( item ); this.active = item.first(); - focused = this.active.children( ".ui-menu-item-wrapper" ) - .addClass( "ui-state-focus" ) - .removeClass( "ui-state-active" ); + focused = this.active.children( ".ui-menu-item-wrapper" ).addClass( "ui-state-active" ); // Only update aria-activedescendant if there's a role // otherwise we assume focus is managed elsewhere @@ -433,7 +431,7 @@ return $.widget( "ui.menu", { return; } - this.active.children( ".ui-menu-item-wrapper" ).removeClass( "ui-state-focus" ); + this.active.children( ".ui-menu-item-wrapper" ).removeClass( "ui-state-active" ); this.active = null; this._trigger( "blur", event, { item: this.active } ); @@ -503,7 +501,7 @@ return $.widget( "ui.menu", { .attr( "aria-hidden", "true" ) .attr( "aria-expanded", "false" ) .end() - .find( ".ui-state-active" ).not( ".ui-state-focus" ) + .find( ".ui-state-active" ).not( ".ui-menu-item-wrapper" ) .removeClass( "ui-state-active" ); }, diff --git a/ui/selectmenu.js b/ui/selectmenu.js index 19f27e809..55da2b552 100644 --- a/ui/selectmenu.js +++ b/ui/selectmenu.js @@ -253,7 +253,7 @@ return $.widget( "ui.selectmenu", { } else { // Menu clears focus on close, reset focus to selected item - this.menu.find( ".ui-state-focus" ).removeClass( "ui-state-focus" ); + this.menu.find( ".ui-state-active" ).removeClass( "ui-state-active" ); this.menuInstance.focus( null, this._getSelectedItem() ); } |