diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index 5b5e82e701b..8d0c6d551bc 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -4340,6 +4340,7 @@ class action_menu implements renderable, templatable { public function add_primary_action($action) { if ($action instanceof action_link || $action instanceof pix_icon) { $action->attributes['role'] = 'menuitem'; + $action->attributes['tabindex'] = '-1'; if ($action instanceof action_menu_link) { $action->actionmenu = $this; } @@ -4355,6 +4356,7 @@ class action_menu implements renderable, templatable { public function add_secondary_action($action) { if ($action instanceof action_link || $action instanceof pix_icon) { $action->attributes['role'] = 'menuitem'; + $action->attributes['tabindex'] = '-1'; if ($action instanceof action_menu_link) { $action->actionmenu = $this; } @@ -4412,7 +4414,8 @@ class action_menu implements renderable, templatable { 'title' => $title, 'aria-label' => $label, 'id' => 'action-menu-toggle-'.$this->instance, - 'role' => 'menuitem' + 'role' => 'menuitem', + 'tabindex' => '-1', ); $link = html_writer::link('#', $string . $this->menutrigger . $pixicon, $attributes); if ($this->prioritise) { diff --git a/lib/templates/user_action_menu_items.mustache b/lib/templates/user_action_menu_items.mustache index ff8942af6fd..29a177973f3 100644 --- a/lib/templates/user_action_menu_items.mustache +++ b/lib/templates/user_action_menu_items.mustache @@ -59,7 +59,7 @@ }} {{#items}} {{#link}} - + {{#pixicon}} {{#pix}}{{pixicon}}{{/pix}} {{/pixicon}} @@ -70,7 +70,7 @@ {{/link}} {{#submenulink}} - + {{#pixicon}} {{#pix}}{{pixicon}}{{/pix}} {{/pixicon}} diff --git a/lib/templates/user_action_menu_submenu_items.mustache b/lib/templates/user_action_menu_submenu_items.mustache index 18896c4b900..605ab867116 100644 --- a/lib/templates/user_action_menu_submenu_items.mustache +++ b/lib/templates/user_action_menu_submenu_items.mustache @@ -41,7 +41,7 @@ }} {{#items}} {{#link}} - + {{text}} {{/link}}