mirror of
https://github.com/element-hq/element-web
synced 2024-11-29 04:48:50 +03:00
Avoid flashing the Jitsi prejoin screen at the user before skipping it (#21665)
This commit is contained in:
parent
b79133c694
commit
eab8a19ec7
2 changed files with 6 additions and 4 deletions
|
@ -56,6 +56,10 @@ body, html {
|
|||
position: absolute;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
// Hidden by default to avoid flashing the prejoin screen at the user when
|
||||
// we're supposed to skip it anyways
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
.joinConferenceFloating {
|
||||
|
|
|
@ -129,11 +129,9 @@ const ack = (ev: CustomEvent<IWidgetApiRequest>) => widgetApi.transport.reply(ev
|
|||
skipOurWelcomeScreen = (new SnakedObject<IConfigOptions["jitsi_widget"]>(jitsiConfig))
|
||||
.get("skip_built_in_welcome_screen") || isVideoChannel;
|
||||
|
||||
// If we're meant to skip our screen, skip to the part where we show Jitsi instead of us.
|
||||
// Either reveal the prejoin screen, or skip straight to Jitsi depending on the config.
|
||||
// We don't set up the call yet though as this might lead to failure without the widget API.
|
||||
if (skipOurWelcomeScreen) {
|
||||
toggleConferenceVisibility(true);
|
||||
}
|
||||
toggleConferenceVisibility(skipOurWelcomeScreen);
|
||||
|
||||
if (widgetApi) {
|
||||
await readyPromise;
|
||||
|
|
Loading…
Reference in a new issue