diff options
author | Joas Schilling <coding@schilljs.com> | 2020-07-31 14:10:50 +0300 |
---|---|---|
committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-08-02 16:14:47 +0300 |
commit | 07064a9c32b8964b4eb880613814dd9cbc1119f5 (patch) | |
tree | 8a025d31fcb073f6fa233adf2fc1590ada371107 | |
parent | e2963e02ff2a8ef6de182746f5e6a824201ae892 (diff) |
Only show browser warning when interacting with talk
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | src/FilesSidebarCallViewApp.vue | 7 | ||||
-rw-r--r-- | src/FilesSidebarTabApp.vue | 5 | ||||
-rw-r--r-- | src/PublicShareAuthRequestPasswordButton.vue | 8 | ||||
-rw-r--r-- | src/PublicShareAuthSidebar.vue | 7 | ||||
-rw-r--r-- | src/PublicShareSidebar.vue | 8 |
5 files changed, 16 insertions, 19 deletions
diff --git a/src/FilesSidebarCallViewApp.vue b/src/FilesSidebarCallViewApp.vue index 7ad620281..ce874bf61 100644 --- a/src/FilesSidebarCallViewApp.vue +++ b/src/FilesSidebarCallViewApp.vue @@ -34,7 +34,6 @@ import { PARTICIPANT } from './constants' import CallView from './components/CallView/CallView' import PreventUnload from 'vue-prevent-unload' -import browserCheck from './mixins/browserCheck' import duplicateSessionHandler from './mixins/duplicateSessionHandler' import isInCall from './mixins/isInCall' import talkHashCheck from './mixins/talkHashCheck' @@ -49,7 +48,6 @@ export default { }, mixins: [ - browserCheck, duplicateSessionHandler, isInCall, talkHashCheck, @@ -165,11 +163,6 @@ export default { }, }, - mounted() { - // see browserCheck mixin - this.checkBrowser() - }, - methods: { setFileInfo(fileInfo) { }, diff --git a/src/FilesSidebarTabApp.vue b/src/FilesSidebarTabApp.vue index 8e9ffd738..d7bf74583 100644 --- a/src/FilesSidebarTabApp.vue +++ b/src/FilesSidebarTabApp.vue @@ -63,6 +63,7 @@ import Axios from '@nextcloud/axios' import CallButton from './components/TopBar/CallButton' import ChatView from './components/ChatView' import duplicateSessionHandler from './mixins/duplicateSessionHandler' +import browserCheck from './mixins/browserCheck' export default { @@ -74,6 +75,7 @@ export default { }, mixins: [ + browserCheck, duplicateSessionHandler, ], @@ -165,6 +167,9 @@ export default { methods: { async joinConversation() { + // see browserCheck mixin + this.checkBrowser() + try { await this.getFileConversation() } catch (error) { diff --git a/src/PublicShareAuthRequestPasswordButton.vue b/src/PublicShareAuthRequestPasswordButton.vue index 6eb0bdec0..037b278f4 100644 --- a/src/PublicShareAuthRequestPasswordButton.vue +++ b/src/PublicShareAuthRequestPasswordButton.vue @@ -39,11 +39,16 @@ <script> import { getPublicShareAuthConversationToken } from './services/publicShareAuthService' +import browserCheck from './mixins/browserCheck' export default { name: 'PublicShareAuthRequestPasswordButton', + mixins: [ + browserCheck, + ], + props: { shareToken: { type: String, @@ -77,6 +82,9 @@ export default { methods: { async requestPassword() { + // see browserCheck mixin + this.checkBrowser() + this.hasRequestFailed = false this.isRequestLoading = true diff --git a/src/PublicShareAuthSidebar.vue b/src/PublicShareAuthSidebar.vue index c4ad49552..d9e4af857 100644 --- a/src/PublicShareAuthSidebar.vue +++ b/src/PublicShareAuthSidebar.vue @@ -48,7 +48,6 @@ import { leaveConversationSync, } from './services/participantsService' import { signalingKill } from './utils/webrtc/index' -import browserCheck from './mixins/browserCheck' import duplicateSessionHandler from './mixins/duplicateSessionHandler' import talkHashCheck from './mixins/talkHashCheck' @@ -62,7 +61,6 @@ export default { }, mixins: [ - browserCheck, duplicateSessionHandler, talkHashCheck, ], @@ -116,11 +114,6 @@ export default { }) }, - mounted() { - // see browserCheck mixin - this.checkBrowser() - }, - methods: { async joinConversation() { diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue index 13d2bde13..ac0c95311 100644 --- a/src/PublicShareSidebar.vue +++ b/src/PublicShareSidebar.vue @@ -142,14 +142,12 @@ export default { }) }, - mounted() { - // see browserCheck mixin - this.checkBrowser() - }, - methods: { async joinConversation() { + // see browserCheck mixin + this.checkBrowser() + this.joiningConversation = true await this.getPublicShareConversationData() |