From 966cfc986179289da20e84d3880ca433f2b2034f Mon Sep 17 00:00:00 2001 From: Jason Woodland Date: Mon, 30 May 2022 19:58:34 +1000 Subject: [PATCH] feat(sidebar): disable video button outside of call --- components/views/navigation/sidebar/controls/Controls.html | 1 + components/views/navigation/sidebar/controls/Controls.vue | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/views/navigation/sidebar/controls/Controls.html b/components/views/navigation/sidebar/controls/Controls.html index 7665443695..f737859b7d 100644 --- a/components/views/navigation/sidebar/controls/Controls.html +++ b/components/views/navigation/sidebar/controls/Controls.html @@ -28,6 +28,7 @@ :text="$t('controls.video')" :action="() => toggleMute('video')" :loading="isLoading" + :disabled="!inCall" loadingText="" > diff --git a/components/views/navigation/sidebar/controls/Controls.vue b/components/views/navigation/sidebar/controls/Controls.vue index 9c070b78e1..14f14ffc38 100644 --- a/components/views/navigation/sidebar/controls/Controls.vue +++ b/components/views/navigation/sidebar/controls/Controls.vue @@ -37,11 +37,14 @@ export default Vue.extend({ return this.audio.muted }, videoMuted(): boolean { - return this.video.disabled + return this.inCall ? this.video.disabled : false }, screenMuted(): boolean { return p2p.id && this.webrtc.streamMuted[p2p.id]?.screen }, + inCall(): boolean { + return this.webrtc.activeCall !== undefined + }, }, methods: { /** @@ -53,7 +56,7 @@ export default Vue.extend({ this.isLoading = true if (kind === 'audio') { this.$store.dispatch('audio/toggleMute', undefined, { root: true }) - } else if (kind === 'video') { + } else if (kind === 'video' && this.inCall) { this.$store.dispatch('video/toggleMute', undefined, { root: true }) } this.isLoading = false