Selectmenu: menuItems now contains link elements instead of list elements

This commit is contained in:
Felix Nagel 2013-02-13 23:09:00 +01:00
parent 8a5e8696ad
commit 06eb3bff6a

View File

@ -146,7 +146,7 @@ $.widget( "ui.selectmenu", {
that.focus = item.index; that.focus = item.index;
// Set ARIA active descendant // Set ARIA active descendant
that.button.attr( "aria-activedescendant", that.menuItems.eq( item.index ).find( "a" ).attr( "id" ) ); that.button.attr( "aria-activedescendant", that.menuItems.eq( item.index ).attr( "id" ) );
}, },
// set ARIA role // set ARIA role
role: "listbox" role: "listbox"
@ -172,7 +172,7 @@ $.widget( "ui.selectmenu", {
this._renderMenu( this.menu, this.items ); this._renderMenu( this.menu, this.items );
this.menu.menu( "refresh" ); this.menu.menu( "refresh" );
this.menuItems = this.menu.find( "li" ).not( ".ui-selectmenu-optgroup" ); this.menuItems = this.menu.find( "li" ).not( ".ui-selectmenu-optgroup" ).find( "a" );
item = this._getSelectedItem(); item = this._getSelectedItem();
// make sure menu is selected item aware // make sure menu is selected item aware
@ -372,11 +372,11 @@ $.widget( "ui.selectmenu", {
}, },
_setAria: function( item ) { _setAria: function( item ) {
var link = this.menuItems.eq( item.index ).find( "a" ), var link = this.menuItems.eq( item.index ),
id = link.attr( "id" ); id = link.attr( "id" );
// change ARIA attr // change ARIA attr
this.menuItems.find( "a" ).attr( "aria-selected", false ); this.menuItems.attr( "aria-selected", false );
link.attr( "aria-selected", true ); link.attr( "aria-selected", true );
this.button.attr({ this.button.attr({
"aria-labelledby": id, "aria-labelledby": id,