diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/components/MainMenu.js | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/src/components/MainMenu.js b/core/src/components/MainMenu.js index 3b7fef6afca..23b75c1610e 100644 --- a/core/src/components/MainMenu.js +++ b/core/src/components/MainMenu.js @@ -72,7 +72,7 @@ export const setUp = () => { if (!$app.is('a')) { $app = $app.closest('a') } - if (event.which === 1 && !event.ctrlKey && !event.metaKey) { + if (event.which === 1 && !event.ctrlKey && !event.metaKey && $app.attr('target') !== '_blank') { $app.find('svg').remove() $app.find('div').remove() // prevent odd double-clicks // no need for theming, loader is already inverted on dark mode @@ -100,7 +100,7 @@ export const setUp = () => { $app = $app.closest('a') } - if (event.which === 1 && !event.ctrlKey && !event.metaKey && $app.parent('#more-apps').length === 0) { + if (event.which === 1 && !event.ctrlKey && !event.metaKey && $app.parent('#more-apps').length === 0 && $app.attr('target') !== '_blank') { $app.find('svg').remove() $app.find('div').remove() // prevent odd double-clicks $app.prepend($('<div/>').addClass( diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index c9ca4e23110..3440358c61f 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -69,6 +69,7 @@ $getUserAvatar = static function (int $size) use ($_): string { <?php foreach ($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>" class="hidden" tabindex="-1"> <a href="<?php print_unescaped($entry['href']); ?>" + <?php if ($entry['target']): ?> target="_blank" rel="noreferrer noopener"<?php endif; ?> <?php if ($entry['active']): ?> class="active"<?php endif; ?> aria-label="<?php p($entry['name']); ?>"> <svg width="24" height="20" viewBox="0 0 24 20" alt=""<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>> @@ -105,6 +106,7 @@ $getUserAvatar = static function (int $size) use ($_): string { <?php foreach ($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" + <?php if ($entry['target']): ?> target="_blank" rel="noreferrer noopener"<?php endif; ?> <?php if ($entry['active']): ?> class="active"<?php endif; ?> aria-label="<?php p($entry['name']); ?>"> <svg width="20" height="20" viewBox="0 0 20 20" alt=""<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>> |