OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #26879 from element-hq/toger5/jitsi-video-channel-lobby 

Use jitsi-lobby in video channel (video rooms)
pull/26914/head
Timo 2024-01-23 18:21:36 +00:00 committed by GitHub
parent db78839e86 8ab44c98b2
commit 41576e41ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vector/jitsi/index.ts
View File

@ -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