From e8ff4cf1ce951f50135d938256169355b38c5fcb Mon Sep 17 00:00:00 2001 From: N-Pex Date: Thu, 31 Aug 2023 09:51:27 +0200 Subject: [PATCH] Don't show "You are joining as" when joining private room link --- src/assets/css/chat.scss | 3 +++ src/components/Join.vue | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/assets/css/chat.scss b/src/assets/css/chat.scss index 3062fbd..80ef2cf 100644 --- a/src/assets/css/chat.scss +++ b/src/assets/css/chat.scss @@ -1370,6 +1370,9 @@ body { .loading-indicator { position: absolute; background-color: rgba(0, 0, 0, 0.2); + &.transparent { + background-color: transparent; + } } .exporting-indicator { diff --git a/src/components/Join.vue b/src/components/Join.vue index 7dba388..4673917 100644 --- a/src/components/Join.vue +++ b/src/components/Join.vue @@ -138,11 +138,12 @@ v-else fluid fill-height - class="loading-indicator" + class="loading-indicator transparent" > - + @@ -174,6 +175,7 @@ export default { loadingMessage: null, waitingForInfo: true, waitingForMembership: false, + waitingForRoomCreation: false, availableAvatars: [], selectedProfile: null, showEditDisplaynameDialog: false, @@ -253,6 +255,7 @@ export default { this.roomName = this.removeHomeServer(this.roomId); this.waitingForInfo = true; + this.waitingForRoomCreation = false; const self = this; this.waitingForMembership = true; if (this.currentUser) { @@ -321,7 +324,7 @@ export default { }); } else if (this.roomId.startsWith("@")) { // Direct chat with user - this.waitingForInfo = false; + this.waitingForRoomCreation = true; this.$nextTick(() => { this.handleJoin(); });