diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-12-01 13:16:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 13:16:22 +0300 |
| commit | 316ac06f20a411c132d213154a3abe94465872cf (patch) | |
| tree | 8f9ed777a38d1b032f7ddbbde96d13c19fce5826 /src | |
| parent | e1f553a6f78f6f5cac1bdd620aa1330782b0eb69 (diff) | |
| parent | c90a6e5c7e0d75d64ee1854031b019ce69de2a63 (diff) | |
Merge pull request #4700 from nextcloud/bugfix/4668/fix-follow-self
Fix follow self + remember state after unfollowing + collapse stripe
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/CallView/CallView.vue | 7 | ||||
| -rw-r--r-- | src/components/CallView/shared/LocalVideo.vue | 4 | ||||
| -rw-r--r-- | src/components/CallView/shared/VideoBottomBar.vue | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue index fc869824b..2958d82dc 100644 --- a/src/components/CallView/CallView.vue +++ b/src/components/CallView/CallView.vue @@ -70,7 +70,7 @@ @switchScreenToId="_switchScreenToId" /> </template> </div> - <!-- Local Video Override mode --> + <!-- Local Video Override mode (following own video) --> <div v-if="showLocalVideo" ref="videoContainer" class="video__promoted autopilot" @@ -79,6 +79,7 @@ ref="localVideo" :fit-video="true" :is-stripe="false" + :show-controls="false" :is-big="true" :local-media-model="localMediaModel" :video-container-aspect-ratio="videoContainerAspectRatio" @@ -529,7 +530,7 @@ export default { if (this.isSidebar) { return } - this.$store.dispatch('setCallViewMode', { isGrid: false }) + this.$store.dispatch('startPresentation') this.$store.dispatch('selectedVideoPeerId', peerId) this.isLocalVideoSelected = false }, @@ -540,7 +541,7 @@ export default { } // Deselect possible selected video this.$store.dispatch('selectedVideoPeerId', 'local') - this.$store.dispatch('setCallViewMode', { isGrid: false }) + this.$store.dispatch('startPresentation') }, debounceFetchPeers: debounce(async function() { diff --git a/src/components/CallView/shared/LocalVideo.vue b/src/components/CallView/shared/LocalVideo.vue index b9e511841..2daa00b21 100644 --- a/src/components/CallView/shared/LocalVideo.vue +++ b/src/components/CallView/shared/LocalVideo.vue @@ -129,6 +129,9 @@ export default { }, computed: { + stopFollowingLabel() { + return t('spreed', 'Back') + }, videoContainerClass() { return { @@ -274,6 +277,7 @@ export default { handleStopFollowing() { this.$store.dispatch('selectedVideoPeerId', null) + this.$store.dispatch('stopPresentation') }, }, diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue index 4cfe00a28..5e0ca0b05 100644 --- a/src/components/CallView/shared/VideoBottomBar.vue +++ b/src/components/CallView/shared/VideoBottomBar.vue @@ -209,6 +209,7 @@ export default { }, handleStopFollowing() { + this.$store.dispatch('stopPresentation') this.$store.dispatch('selectedVideoPeerId', null) }, }, |