butter/keanu-weblite
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

3
src/assets/css/chat.scss
View file

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

9
src/components/Join.vue
View file

@ -138,11 +138,12 @@
v-else v-else
fluid fluid
fill-height fill-height
class="loading-indicator" class="loading-indicator transparent"
> >
<v-row align="center" justify="center"> <v-row align="center" justify="center">
<v-col class="text-center"> <v-col class="text-center">
<v-progress-circular <interactive-auth ref="interactiveAuth" v-if="waitingForRoomCreation" />
<v-progress-circular v-else
indeterminate indeterminate
color="primary" color="primary"
></v-progress-circular> ></v-progress-circular>
@ -174,6 +175,7 @@ export default {
loadingMessage: null, loadingMessage: null,
waitingForInfo: true, waitingForInfo: true,
waitingForMembership: false, waitingForMembership: false,
waitingForRoomCreation: false,
availableAvatars: [], availableAvatars: [],
selectedProfile: null, selectedProfile: null,
showEditDisplaynameDialog: false, showEditDisplaynameDialog: false,
@ -253,6 +255,7 @@ export default {
this.roomName = this.removeHomeServer(this.roomId); this.roomName = this.removeHomeServer(this.roomId);
this.waitingForInfo = true; this.waitingForInfo = true;
this.waitingForRoomCreation = false;
const self = this; const self = this;
this.waitingForMembership = true; this.waitingForMembership = true;
if (this.currentUser) { if (this.currentUser) {
@ -321,7 +324,7 @@ export default {
}); });
} else if (this.roomId.startsWith("@")) { } else if (this.roomId.startsWith("@")) {
// Direct chat with user // Direct chat with user
this.waitingForInfo = false; this.waitingForRoomCreation = true;
this.$nextTick(() => { this.$nextTick(() => {
this.handleJoin(); this.handleJoin();
}); });