summaryrefslogtreecommitdiffstats
path: root/src/mixins/isInCall.js
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2022-12-19 01:46:39 +0100
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2023-01-31 05:00:56 +0100
commit8479b8a18cd5f0b3782864e37956ec3bc0b5681f (patch)
tree8f08a844f8f11048edec3067299743ba3416afbf /src/mixins/isInCall.js
parentcee13cb8cf10f5a4c9437731732df8a2e10ffcfe (diff)
Handle "switchto" message in WebUI
When the client receives a message to switch to a different room the WebUI joins that room. If the WebUI was already in a call it will automatically join the call in the target room; in that case the call view will be kept shown during the switch, rather than showing the chat while leaving the previous call and joining the new room to then show the call again when joining the call in the target room. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'src/mixins/isInCall.js')
-rw-r--r--src/mixins/isInCall.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mixins/isInCall.js b/src/mixins/isInCall.js
index a5cfa0a0c..d3c6924f0 100644
--- a/src/mixins/isInCall.js
+++ b/src/mixins/isInCall.js
@@ -35,8 +35,9 @@ export default {
computed: {
isInCall() {
- return this.sessionStorageJoinedConversation === this.$store.getters.getToken()
- && this.$store.getters.isInCall(this.$store.getters.getToken())
+ return this.$store.getters.forceCallView
+ || (this.sessionStorageJoinedConversation === this.$store.getters.getToken()
+ && this.$store.getters.isInCall(this.$store.getters.getToken()))
},
},