Merge branch '485-mvp-for-journalist-mode' into 'dev'

Don't show "You are joining as" when joining private room link

See merge request keanuapp/keanuapp-weblite!230
This commit is contained in:
N Pex 2023-08-31 07:53:45 +00:00
commit 307ddcd909
2 changed files with 9 additions and 3 deletions

View file

@ -1370,6 +1370,9 @@ body {
.loading-indicator {
position: absolute;
background-color: rgba(0, 0, 0, 0.2);
&.transparent {
background-color: transparent;
}
}
.exporting-indicator {

View file

@ -138,11 +138,12 @@
v-else
fluid
fill-height
class="loading-indicator"
class="loading-indicator transparent"
>
<v-row align="center" justify="center">
<v-col class="text-center">
<v-progress-circular
<interactive-auth ref="interactiveAuth" v-if="waitingForRoomCreation" />
<v-progress-circular v-else
indeterminate
color="primary"
></v-progress-circular>
@ -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();
});