From daae9eb016b8a06f14b4b462c01982982bbd1d10 Mon Sep 17 00:00:00 2001 From: "Grigorii K. Shartsev" Date: Wed, 28 Feb 2024 22:03:18 +0100 Subject: [PATCH] fix(desktop): allow avatar menu on desktop Signed-off-by: Grigorii K. Shartsev --- src/components/AvatarWrapper/AvatarWrapper.vue | 7 +------ src/components/TopBar/TopBar.vue | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue index b7c961d6a40..803b50aaa24 100644 --- a/src/components/AvatarWrapper/AvatarWrapper.vue +++ b/src/components/AvatarWrapper/AvatarWrapper.vue @@ -35,7 +35,7 @@ :display-name="name" :menu-container="menuContainerWithFallback" :disable-tooltip="disableTooltip" - :disable-menu="isDisabledMenu" + :disable-menu="disableMenu" :show-user-status="showUserStatus" :show-user-status-compact="showUserStatusCompact" :preloaded-user-status="preloadedUserStatus" @@ -173,11 +173,6 @@ export default { menuContainerWithFallback() { return this.menuContainer ?? this.$store.getters.getMainContainerSelector() }, - isDisabledMenu() { - // NcAvatarMenu doesn't work on Desktop - // See: https://github.com/nextcloud/talk-desktop/issues/34 - return IS_DESKTOP || this.disableMenu - }, }, } diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index 04cf6938594..7e5b0293697 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -25,7 +25,7 @@ class="conversation-icon" :offline="isPeerInactive" :item="conversation" - :disable-menu="disableMenu" + :disable-menu="false" show-user-online-status :hide-favorite="false" :hide-call="false" /> @@ -301,12 +301,6 @@ export default { return n('spreed', '%n participant in call', '%n participants in call', this.$store.getters.participantsInCall(this.token)) }, - disableMenu() { - // NcAvatarMenu doesn't work on Desktop - // See: https://github.com/nextcloud/talk-desktop/issues/34 - return IS_DESKTOP - }, - supportedReactions() { return getCapabilities()?.spreed?.config?.call?.['supported-reactions'] },