Skip to content

Commit

Permalink
Merge pull request #11679 from nextcloud/backport/11675/stable28
Browse files Browse the repository at this point in the history
[stable28] fix(desktop): allow avatar menu on desktop
  • Loading branch information
nickvergessen authored Feb 28, 2024
2 parents 99e198e + daae9eb commit 88948ee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
7 changes: 1 addition & 6 deletions src/components/AvatarWrapper/AvatarWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
},
},
}
</script>
Expand Down
8 changes: 1 addition & 7 deletions src/components/TopBar/TopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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']
},
Expand Down

0 comments on commit 88948ee

Please sign in to comment.