Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2021-03-02 12:12:54 +0300
committerGitHub <noreply@github.com>2021-03-02 12:12:54 +0300
commitc48008efdc9a5fe74935a2aa05e275799aeda396 (patch)
tree42b4bc949e7eeddac85f6e2f1efdceb7456fbb63 /src/PublicShareSidebar.vue
parentd366e69de5ca25d73a775a729f18f561840b30ae (diff)
parent2999b5d66559817e57f52be5e02f9cd859da8cc0 (diff)
Merge pull request #5082 from nextcloud/bugfix/4552/fix-duplicate-on-delete
Fix redirect when deleting current conversation
Diffstat (limited to 'src/PublicShareSidebar.vue')
-rw-r--r--src/PublicShareSidebar.vue8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index ecfe17d63..5f39cfd21 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -58,7 +58,7 @@ import {
} from './services/participantsService'
import { signalingKill } from './utils/webrtc/index'
import browserCheck from './mixins/browserCheck'
-import duplicateSessionHandler from './mixins/duplicateSessionHandler'
+import sessionIssueHandler from './mixins/sessionIssueHandler'
import isInCall from './mixins/isInCall'
import participant from './mixins/participant'
import talkHashCheck from './mixins/talkHashCheck'
@@ -77,7 +77,7 @@ export default {
mixins: [
browserCheck,
- duplicateSessionHandler,
+ sessionIssueHandler,
isInCall,
participant,
talkHashCheck,
@@ -116,7 +116,7 @@ export default {
},
warnLeaving() {
- return !this.isLeavingAfterSessionConflict && this.isInCall
+ return !this.isLeavingAfterSessionIssue && this.isInCall
},
},
@@ -126,7 +126,7 @@ export default {
// We have to do this synchronously, because in unload and beforeunload
// Promises, async and await are prohibited.
signalingKill()
- if (!this.isLeavingAfterSessionConflict) {
+ if (!this.isLeavingAfterSessionIssue) {
leaveConversationSync(this.token)
}
}