mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-10-05 01:44:18 +00:00
ARIA & Focus changes to menu, specifically to how aria-activedescendant is handled
This commit is contained in:
parent
59c787fa4a
commit
f89f0ca61f
73
ui/jquery.ui.menu.js
vendored
73
ui/jquery.ui.menu.js
vendored
@ -32,7 +32,7 @@ $.widget("ui.menu", {
|
|||||||
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
|
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
|
||||||
.attr({
|
.attr({
|
||||||
id: this.menuId,
|
id: this.menuId,
|
||||||
role: "listbox"
|
role: "menu"
|
||||||
})
|
})
|
||||||
.bind( "click.menu", function( event ) {
|
.bind( "click.menu", function( event ) {
|
||||||
var item = $( event.target ).closest( ".ui-menu-item:has(a)" );
|
var item = $( event.target ).closest( ".ui-menu-item:has(a)" );
|
||||||
@ -160,41 +160,62 @@ $.widget("ui.menu", {
|
|||||||
},
|
},
|
||||||
|
|
||||||
_destroy: function() {
|
_destroy: function() {
|
||||||
|
//destroy (sub)menus
|
||||||
this.element
|
this.element
|
||||||
|
.removeAttr( "aria-activedescendant" )
|
||||||
|
.find("ul")
|
||||||
|
.andSelf()
|
||||||
.removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
|
.removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
|
||||||
.removeAttr( "tabIndex" )
|
|
||||||
.removeAttr( "role" )
|
.removeAttr( "role" )
|
||||||
.removeAttr( "aria-activedescendant" );
|
.removeAttr("id")
|
||||||
|
.removeAttr( "aria-labelledby" )
|
||||||
|
.removeAttr( "aria-expanded" )
|
||||||
|
.removeAttr( "aria-hidden" )
|
||||||
|
.show();
|
||||||
|
|
||||||
this.element.children( ".ui-menu-item" )
|
//destroy menu items
|
||||||
|
this.element.find( ".ui-menu-item" )
|
||||||
|
.unbind( ".menu" )
|
||||||
.removeClass( "ui-menu-item" )
|
.removeClass( "ui-menu-item" )
|
||||||
.removeAttr( "role" )
|
.removeAttr( "role" )
|
||||||
.children( "a" )
|
.children( "a" )
|
||||||
.removeClass( "ui-corner-all ui-state-hover" )
|
.removeClass( "ui-corner-all ui-state-hover" )
|
||||||
.removeAttr( "tabIndex" )
|
.removeAttr( "tabIndex" )
|
||||||
.unbind( ".menu" );
|
.removeAttr( "role" )
|
||||||
|
.removeAttr( "aria-haspopup" )
|
||||||
|
.removeAttr( "id" )
|
||||||
|
.children(".ui-icon").remove();
|
||||||
},
|
},
|
||||||
|
|
||||||
refresh: function() {
|
refresh: function() {
|
||||||
|
var self = this;
|
||||||
// initialize nested menus
|
// initialize nested menus
|
||||||
// TODO add role=listbox to these, too? or just the top level menu?
|
|
||||||
var submenus = this.element.find("ul:not(.ui-menu)")
|
var submenus = this.element.find("ul:not(.ui-menu)")
|
||||||
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
|
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
|
||||||
|
.attr("role", "menu")
|
||||||
.hide()
|
.hide()
|
||||||
|
.attr("aria-hidden", "true")
|
||||||
submenus
|
.attr("aria-expanded", "false")
|
||||||
.prev("a")
|
;
|
||||||
.prepend('<span class="ui-icon ui-icon-carat-1-e"></span>');
|
|
||||||
|
|
||||||
|
|
||||||
// don't refresh list items that are already adapted
|
// don't refresh list items that are already adapted
|
||||||
var items = submenus.add(this.element).children( "li:not(.ui-menu-item):has(a)" )
|
var items = submenus.add(this.element).children( "li:not(.ui-menu-item):has(a)" )
|
||||||
.addClass( "ui-menu-item" )
|
.addClass( "ui-menu-item" )
|
||||||
.attr( "role", "menuitem" );
|
.attr( "role", "presentation" );
|
||||||
|
|
||||||
items.children( "a" )
|
items.children( "a" )
|
||||||
.addClass( "ui-corner-all" )
|
.addClass( "ui-corner-all" )
|
||||||
.attr( "tabIndex", -1 );
|
.attr( "tabIndex", -1 )
|
||||||
|
.attr( "role", "menuitem" )
|
||||||
|
.attr("id", function(i) {return self.element.attr("id") + "-" + i});
|
||||||
|
|
||||||
|
submenus.each(function() {
|
||||||
|
var menu = $(this);
|
||||||
|
var item = menu.prev("a")
|
||||||
|
item.attr("aria-haspopup", "true")
|
||||||
|
.prepend('<span class="ui-icon ui-icon-carat-1-e"></span>');
|
||||||
|
menu.attr("aria-labelledby", item.attr("id"));
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
focus: function( event, item ) {
|
focus: function( event, item ) {
|
||||||
@ -219,13 +240,8 @@ $.widget("ui.menu", {
|
|||||||
this.active = item.first()
|
this.active = item.first()
|
||||||
.children( "a" )
|
.children( "a" )
|
||||||
.addClass( "ui-state-focus" )
|
.addClass( "ui-state-focus" )
|
||||||
.attr( "id", function(index, id) {
|
|
||||||
return (self.itemId = id || self.menuId + "-activedescendant");
|
|
||||||
})
|
|
||||||
.end();
|
.end();
|
||||||
// need to remove the attribute before adding it for the screenreader to pick up the change
|
self.element.attr("aria-activedescendant", self.active.children("a").attr("id"))
|
||||||
// see http://groups.google.com/group/jquery-a11y/msg/929e0c1e8c5efc8f
|
|
||||||
this.element.removeAttr("aria-activedescendant").attr("aria-activedescendant", self.itemId)
|
|
||||||
|
|
||||||
self.timer = setTimeout(function() {
|
self.timer = setTimeout(function() {
|
||||||
self._close();
|
self._close();
|
||||||
@ -247,10 +263,6 @@ $.widget("ui.menu", {
|
|||||||
clearTimeout(this.timer);
|
clearTimeout(this.timer);
|
||||||
|
|
||||||
this.active.children( "a" ).removeClass( "ui-state-focus" );
|
this.active.children( "a" ).removeClass( "ui-state-focus" );
|
||||||
// remove only generated id
|
|
||||||
$( "#" + this.menuId + "-activedescendant" ).removeAttr( "id" );
|
|
||||||
this.element.removeAttr( "aria-activedescenant" );
|
|
||||||
this._trigger( "blur", event );
|
|
||||||
this.active = null;
|
this.active = null;
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -264,7 +276,7 @@ $.widget("ui.menu", {
|
|||||||
},
|
},
|
||||||
|
|
||||||
_open: function(submenu) {
|
_open: function(submenu) {
|
||||||
this.element.find(".ui-menu").not(submenu.parents()).hide();
|
this.element.find(".ui-menu").not(submenu.parents()).hide().attr("aria-hidden", "true");
|
||||||
|
|
||||||
var position = $.extend({}, {
|
var position = $.extend({}, {
|
||||||
of: this.active
|
of: this.active
|
||||||
@ -273,14 +285,14 @@ $.widget("ui.menu", {
|
|||||||
: this.options.position
|
: this.options.position
|
||||||
);
|
);
|
||||||
|
|
||||||
submenu.show().position(position);
|
submenu.show().removeAttr("aria-hidden").attr("aria-expanded", "true").position(position);
|
||||||
|
|
||||||
this.active.find(">a:first").addClass("ui-state-active");
|
this.active.find(">a:first").addClass("ui-state-active");
|
||||||
},
|
},
|
||||||
|
|
||||||
closeAll: function() {
|
closeAll: function() {
|
||||||
this.element
|
this.element
|
||||||
.find("ul").hide().end()
|
.find("ul").hide().attr("aria-hidden", "true").attr("aria-expanded", "false").end()
|
||||||
.find("a.ui-state-active").removeClass("ui-state-active");
|
.find("a.ui-state-active").removeClass("ui-state-active");
|
||||||
this.blur();
|
this.blur();
|
||||||
this.activeMenu = this.element;
|
this.activeMenu = this.element;
|
||||||
@ -288,25 +300,26 @@ $.widget("ui.menu", {
|
|||||||
|
|
||||||
_close: function() {
|
_close: function() {
|
||||||
this.active.parent()
|
this.active.parent()
|
||||||
.find("ul").hide().end()
|
.find("ul").hide().attr("aria-hidden", "true").attr("aria-expanded", "false").end()
|
||||||
.find("a.ui-state-active").removeClass("ui-state-active");
|
.find("a.ui-state-active").removeClass("ui-state-active");
|
||||||
},
|
},
|
||||||
|
|
||||||
left: function(event) {
|
left: function(event) {
|
||||||
var newItem = this.active && this.active.parents("li").first();
|
var newItem = this.active && this.active.parents("li:not(.ui-menubar-item)").first();
|
||||||
if (newItem && newItem.length) {
|
if (newItem && newItem.length) {
|
||||||
this.active.parent().hide();
|
this.active.parent().attr("aria-hidden", "true").attr("aria-expanded", "false").hide();
|
||||||
this.focus(event, newItem);
|
this.focus(event, newItem);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
right: function(event) {
|
right: function(event) {
|
||||||
|
var self= this;
|
||||||
var newItem = this.active && this.active.children("ul").children("li").first();
|
var newItem = this.active && this.active.children("ul").children("li").first();
|
||||||
if (newItem && newItem.length) {
|
if (newItem && newItem.length) {
|
||||||
this._open(newItem.parent());
|
this._open(newItem.parent());
|
||||||
var current = this.active;
|
var current = this.active;
|
||||||
this.focus(event, newItem);
|
setTimeout(function(){self.focus(event, newItem)}, 20);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user