diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2020-11-30 17:47:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 17:47:35 +0300 |
| commit | 5d70066682c4b074fc0d8cc0c89cefc3f4d3a8c7 (patch) | |
| tree | 7c75cc3012b2ba3922c648f721f5319487746187 /src | |
| parent | 7be00a1cb85e15d0be535e24b12471ac40932c7d (diff) | |
| parent | 1e19c7fbca8f79188385261c3895152a8534b0bd (diff) | |
Merge pull request #4699 from nextcloud/bugfix/4574/sidebar-no-self-follow
Disallow following self in sidebar mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/CallView/CallView.vue | 5 | ||||
| -rw-r--r-- | src/components/CallView/shared/LocalVideo.vue | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue index 8952db016..fc869824b 100644 --- a/src/components/CallView/CallView.vue +++ b/src/components/CallView/CallView.vue @@ -526,13 +526,16 @@ export default { this.videoContainerAspectRatio = videoContainerWidth / VideoContainerHeight }, handleSelectVideo(peerId) { + if (this.isSidebar) { + return + } this.$store.dispatch('setCallViewMode', { isGrid: false }) this.$store.dispatch('selectedVideoPeerId', peerId) this.isLocalVideoSelected = false }, handleClickLocalVideo() { // DO nothing if no video - if (!this.hasLocalVideo) { + if (!this.hasLocalVideo || this.isSidebar) { return } // Deselect possible selected video diff --git a/src/components/CallView/shared/LocalVideo.vue b/src/components/CallView/shared/LocalVideo.vue index b75b110a9..b9e511841 100644 --- a/src/components/CallView/shared/LocalVideo.vue +++ b/src/components/CallView/shared/LocalVideo.vue @@ -184,7 +184,7 @@ export default { }, isSelectable() { - return this.hasLocalVideo && this.$store.getters.selectedVideoPeerId !== 'local' + return !this.isSidebar && this.hasLocalVideo && this.$store.getters.selectedVideoPeerId !== 'local' }, }, |