From e40f52a5e8a78d2e2469e2fc8badc051dcc1a3af Mon Sep 17 00:00:00 2001 From: Moritz Strohm <strohm@data-quest.de> Date: Thu, 20 Jan 2022 13:18:01 +0000 Subject: [PATCH] fix for BIESt #441 --- resources/assets/javascripts/lib/actionmenu.js | 2 +- templates/shared/action-menu.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/assets/javascripts/lib/actionmenu.js b/resources/assets/javascripts/lib/actionmenu.js index 7422ac8fe0f..0d1ca26fec4 100644 --- a/resources/assets/javascripts/lib/actionmenu.js +++ b/resources/assets/javascripts/lib/actionmenu.js @@ -197,7 +197,7 @@ class ActionMenu { this.menu.toggleClass('is-open', this.is_open); this.menu.toggleClass('is-reversed', this.is_reversed); - this.menu.attr('aria-expanded', this.is_open ? 'true' : 'false'); + this.menu.find('.action-menu-icon').attr('aria-expanded', this.is_open ? 'true' : 'false'); } /** diff --git a/templates/shared/action-menu.php b/templates/shared/action-menu.php index e07b6957e92..37ead278227 100644 --- a/templates/shared/action-menu.php +++ b/templates/shared/action-menu.php @@ -1,15 +1,15 @@ <? // class "action-menu" will be set from API ?> -<nav <?= arrayToHtmlAttributes($attributes) ?>> - <a class="action-menu-icon" title="<?= _('Aktionen') ?>" aria-expanded="false" aria-label="<?= _("Aktionsmenü") ?>" href="#"> +<nav <?= arrayToHtmlAttributes($attributes) ?> aria-role="presentation"> + <a class="action-menu-icon" aria-expanded="false" title="<?= _('Aktionsmenü') ?>" href="#"> <div></div> <div></div> <div></div> </a> <div class="action-menu-content"> - <div class="action-menu-title"> + <div class="action-menu-title" aria-hidden="true"> <?= _('Aktionen') ?> </div> - <ul class="action-menu-list"> + <ul class="action-menu-list" aria-label="<?= _('Aktionen') ?>"> <? foreach ($actions as $action): ?> <li class="action-menu-item <? if (isset($action['attributes']['disabled'])) echo 'action-menu-item-disabled'; ?>"> <? if ($action['type'] === 'link'): ?> -- GitLab