diff options
| author | Joas Schilling <coding@schilljs.com> | 2022-07-14 14:36:56 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2022-07-14 14:36:56 +0200 |
| commit | 1ad24d22dffa108cecf2c5febc2f9fcd5d76070f (patch) | |
| tree | 23c99f87fcb049f889f84b17ee9b85ab488cbff6 | |
| parent | fc9a644bb54736721f14135be833f40bb8d6b124 (diff) | |
| download | nextcloud-server-1ad24d22dffa108cecf2c5febc2f9fcd5d76070f.tar.gz nextcloud-server-1ad24d22dffa108cecf2c5febc2f9fcd5d76070f.zip | |
Fix duplicate id "hole"
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | core/src/components/MainMenu.js | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/src/components/MainMenu.js b/core/src/components/MainMenu.js index 436fd835cc3..603338d05b3 100644 --- a/core/src/components/MainMenu.js +++ b/core/src/components/MainMenu.js @@ -45,8 +45,8 @@ export const setUp = () => { } else { appmenuElement.classList.add('has-unread') appsElement.classList.add('has-unread') - appmenuElement.getElementsByTagName('image')[0].style.mask = 'url(#hole)' - appsElement.getElementsByTagName('image')[0].style.mask = 'url(#hole)' + appmenuElement.getElementsByTagName('image')[0].style.mask = 'url(#hole-appmenu-' + id + ')' + appsElement.getElementsByTagName('image')[0].style.mask = 'url(#hole-' + id + ')' } document.getElementById('appmenu').querySelector('[data-id="' + id + '"] .unread-counter').textContent = counter document.getElementById('apps').querySelector('[data-id="' + id + '"] .unread-counter').textContent = counter diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index eafca3da1bd..337a1dfc317 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -73,9 +73,9 @@ $getUserAvatar = static function (int $size) use ($_): string { <?php if (isset($entry['target']) && $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 } ?>> + <svg width="24" height="20" viewBox="0 0 24 20"<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>> <defs> - <mask id="hole"> + <mask id="hole-appmenu-<?php p($entry['id']); ?>"> <rect width="100%" height="100%" fill="white"/> <circle r="4.5" cx="21" cy="3" fill="black"/> </mask> @@ -109,10 +109,10 @@ $getUserAvatar = static function (int $size) use ($_): string { <?php if (isset($entry['target']) && $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 16 16" alt=""<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>> + <svg width="20" height="20" viewBox="0 0 16 16"<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>> <defs> <filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter> - <mask id="hole"> + <mask id="hole-<?php p($entry['id']); ?>"> <rect width="100%" height="100%" fill="white"/> <circle r="4.5" cx="17" cy="3" fill="black"/> </mask> |