Skip to content

[4.0] Optimize code for aria-current #30328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilsonge merged 2 commits into from
Aug 10, 2020
Merged

[4.0] Optimize code for aria-current #30328

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89b67d6
Optimize code for aria-current
SharkyKZ Aug 10, 2020
877d80e
Merge remote-tracking branch 'upstream/4.0-dev' into j4/micro/aria-cu…
SharkyKZ Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions modules/mod_menu/src/Helper/MenuHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public static function getList(&$params)
{
$app = Factory::getApplication();
$menu = $app->getMenu();
$input = $app->getInput();

// Get active menu item
$base = self::getBase($params);
Expand Down Expand Up @@ -65,22 +64,13 @@ public static function getList(&$params)

if ($items)
{
$inputVars = $app->getInput()->getArray();

foreach ($items as $i => $item)
{
$item->parent = false;
$itemParams = $item->getParams();

$item->current = true;

foreach ($item->query as $key => $value)
{
if ($input->get($key) !== $value)
{
$item->current = false;
break;
}
}

if (isset($items[$lastitem]) && $items[$lastitem]->id == $item->parent_id && $itemParams->get('menu_show', 1) == 1)
{
$items[$lastitem]->parent = true;
Expand All @@ -103,6 +93,17 @@ public static function getList(&$params)
continue;
}

$item->current = true;

foreach ($item->query as $key => $value)
{
if (!isset($inputVars[$key]) || $inputVars[$key] !== $value)
{
$item->current = false;
break;
}
}

$item->deeper = false;
$item->shallower = false;
$item->level_diff = 0;
Expand Down