aboutsummaryrefslogtreecommitdiffstats
path: root/ui/menu.js
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2015-01-19 17:00:57 +0100
committerJörn Zaefferer <joern.zaefferer@gmail.com>2015-01-21 18:07:43 +0100
commit0bbd1569182bc03e8dc4f5f8aa203e8edbe15f99 (patch)
tree1328997e98da34765e5c468989edf467601e511c /ui/menu.js
parent7137c90b1883bc19f23678582170e9df981a084d (diff)
downloadjquery-ui-0bbd1569182bc03e8dc4f5f8aa203e8edbe15f99.tar.gz
jquery-ui-0bbd1569182bc03e8dc4f5f8aa203e8edbe15f99.zip
Menu: Use ui-state-active consistently
So far we were using ui-state-active on active parent items, ui-state-focus on active child items. The theme update highlighted the visual inconsistency. With this change, only ui-state-active is used. Fixes #10692
Diffstat (limited to 'ui/menu.js')
-rw-r--r--ui/menu.js8
1 files changed, 3 insertions, 5 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" );
},