mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-10 07:05:14 +00:00
Merge pull request #26879 from element-hq/toger5/jitsi-video-channel-lobby
Use jitsi-lobby in video channel (video rooms)
This commit is contained in:
commit
41576e41ca
1 changed files with 3 additions and 6 deletions
|
@ -292,9 +292,7 @@ function switchVisibleContainers(): void {
|
||||||
|
|
||||||
function toggleConferenceVisibility(inConference: boolean): void {
|
function toggleConferenceVisibility(inConference: boolean): void {
|
||||||
document.getElementById("jitsiContainer")!.style.visibility = inConference ? "unset" : "hidden";
|
document.getElementById("jitsiContainer")!.style.visibility = inConference ? "unset" : "hidden";
|
||||||
// Video rooms have a separate UI for joining, so they should never show our join button
|
document.getElementById("joinButtonContainer")!.style.visibility = inConference ? "hidden" : "unset";
|
||||||
document.getElementById("joinButtonContainer")!.style.visibility =
|
|
||||||
inConference || isVideoChannel ? "hidden" : "unset";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function skipToJitsiSplashScreen(): void {
|
function skipToJitsiSplashScreen(): void {
|
||||||
|
@ -450,9 +448,8 @@ async function joinConference(audioInput?: string | null, videoInput?: string |
|
||||||
|
|
||||||
// Video channel widgets need some more tailored config options
|
// Video channel widgets need some more tailored config options
|
||||||
if (isVideoChannel) {
|
if (isVideoChannel) {
|
||||||
// Ensure that we skip Jitsi Meet's native prejoin screen, for
|
// We don't skip jitsi's prejoin screen for video rooms.
|
||||||
// deployments that have it enabled
|
options.configOverwrite!.prejoinConfig = { enabled: true };
|
||||||
options.configOverwrite!.prejoinConfig = { enabled: false };
|
|
||||||
// Use a simplified set of toolbar buttons
|
// Use a simplified set of toolbar buttons
|
||||||
options.configOverwrite!.toolbarButtons = ["microphone", "camera", "tileview", "hangup"];
|
options.configOverwrite!.toolbarButtons = ["microphone", "camera", "tileview", "hangup"];
|
||||||
// Note: We can hide the screenshare button in video rooms but not in
|
// Note: We can hide the screenshare button in video rooms but not in
|
||||||
|
|
Loading…
Reference in a new issue