diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-06-24 11:56:24 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-06-24 11:56:24 +0300 |
| commit | a7ec597c330b2de79c532022cab41087430d44e4 (patch) | |
| tree | 135f60347c9fdabe8d17d685d59a6d4eca2fbeab | |
| parent | a4ea2efbb52764e3c5dd295b85368cf0b569ea3f (diff) | |
This worksthis-works
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | src/App.vue | 7 | ||||
| -rw-r--r-- | src/components/TopBar/CallButton.vue | 20 | ||||
| -rw-r--r-- | src/views/MainView.vue | 7 |
3 files changed, 33 insertions, 1 deletions
diff --git a/src/App.vue b/src/App.vue index 9202f3095..a7ecf0921 100644 --- a/src/App.vue +++ b/src/App.vue @@ -117,6 +117,13 @@ export default { }, isInCall() { + console.log('isInCall') + console.log(SessionStorage.getItem('joined_conversation')) + console.log(this.token) + console.log(this.participant.inCall) + console.log(SessionStorage.getItem('joined_conversation') === this.token + && this.participant.inCall !== PARTICIPANT.CALL_FLAG.DISCONNECTED) + return SessionStorage.getItem('joined_conversation') === this.token && this.participant.inCall !== PARTICIPANT.CALL_FLAG.DISCONNECTED }, diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue index e14e1842d..790cd8c7d 100644 --- a/src/components/TopBar/CallButton.vue +++ b/src/components/TopBar/CallButton.vue @@ -106,7 +106,14 @@ export default { }, isInCall() { - return SessionStorage.getItem('joined_conversation') === this.token + console.log('CallButton::isInCall') + console.log(this.sessionJoinedConversation) + // console.log(this.token) + // console.log(this.participant.inCall) + // console.log(SessionStorage.getItem('joined_conversation') === this.token + // && this.participant.inCall !== PARTICIPANT.CALL_FLAG.DISCONNECTED) + + return this.sessionJoinedConversation === this.token && this.participant.inCall !== PARTICIPANT.CALL_FLAG.DISCONNECTED }, @@ -186,6 +193,17 @@ export default { return this.conversation.readOnly === CONVERSATION.STATE.READ_WRITE && this.isInCall }, + + sessionJoinedConversation() { + return SessionStorage.getItem('joined_conversation') + }, + }, + + watch: { + sessionJoinedConversation(token) { + console.log('sessionJoinedConversation') + console.log(token) + }, }, methods: { diff --git a/src/views/MainView.vue b/src/views/MainView.vue index 4806c9814..e4ddb25e3 100644 --- a/src/views/MainView.vue +++ b/src/views/MainView.vue @@ -66,6 +66,13 @@ export default { }, showChatInSidebar() { + console.log('showChatInSidebar') + console.log(SessionStorage.getItem('joined_conversation')) + console.log(this.token) + console.log(this.participant.inCall) + console.log(SessionStorage.getItem('joined_conversation') === this.token + && this.participant.inCall !== PARTICIPANT.CALL_FLAG.DISCONNECTED) + return SessionStorage.getItem('joined_conversation') === this.token && this.participant.inCall !== PARTICIPANT.CALL_FLAG.DISCONNECTED }, |