diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-10-21 20:33:49 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-10-21 20:33:49 +0200 |
| commit | fab6b8883e9464d101e2550dd2c12706a9de164d (patch) | |
| tree | 5b19fadfa678d5709dfb9451b7635f00f038369f /ui/jquery.ui.menu.js | |
| parent | 7af3dab075b71b4a4b542e3e3201229399a56959 (diff) | |
| parent | fdc7052fdb7fdac34e79203a0cea2376fa588994 (diff) | |
| download | jquery-ui-fab6b8883e9464d101e2550dd2c12706a9de164d.tar.gz jquery-ui-fab6b8883e9464d101e2550dd2c12706a9de164d.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.menu.js')
| -rw-r--r-- | ui/jquery.ui.menu.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 059f80b30..b0ff38894 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -371,7 +371,7 @@ $.widget( "ui.menu", { this._scrollIntoView( item ); this.active = item.first(); - focused = this.active.addClass( "ui-state-focus" ); + focused = this.active.addClass( "ui-state-focus" ).removeClass( "ui-state-active" ); // Only update aria-activedescendant if there's a role // otherwise we assume focus is managed elsewhere if ( this.options.role ) { @@ -498,7 +498,7 @@ $.widget( "ui.menu", { .attr( "aria-hidden", "true" ) .attr( "aria-expanded", "false" ) .end() - .find( ".ui-state-active" ) + .find( ".ui-state-active" ).not( ".ui-state-focus" ) .removeClass( "ui-state-active" ); }, |