Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use jitsi-lobby in video channel (video rooms) #26879

Merged
merged 5 commits into from
Jan 23, 2024
Merged

Use jitsi-lobby in video channel (video rooms) #26879

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03cf7ca
Use jitsi-lobby in video channel
toger5 Jan 16, 2024
872b7f5
update comment
toger5 Jan 16, 2024
feab505
review
toger5 Jan 19, 2024
243515a
Merge branch 'develop' into toger5/jitsi-video-channel-lobby
toger5 Jan 19, 2024
8ab44c9
maintain behavior for non video rooms
toger5 Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/vector/jitsi/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,7 @@ function switchVisibleContainers(): void {

function toggleConferenceVisibility(inConference: boolean): void {
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 || isVideoChannel ? "hidden" : "unset";
document.getElementById("joinButtonContainer")!.style.visibility = inConference ? "hidden" : "unset";
}

function skipToJitsiSplashScreen(): void {
Expand Down Expand Up @@ -450,9 +448,8 @@ async function joinConference(audioInput?: string | null, videoInput?: string |

// Video channel widgets need some more tailored config options
if (isVideoChannel) {
// Ensure that we skip Jitsi Meet's native prejoin screen, for
// deployments that have it enabled
options.configOverwrite!.prejoinConfig = { enabled: false };
// We don't skip jitsi's prejoin screen for video rooms.
options.configOverwrite!.prejoinConfig = { enabled: true };
// Use a simplified set of toolbar buttons
options.configOverwrite!.toolbarButtons = ["microphone", "camera", "tileview", "hangup"];
// Note: We can hide the screenshare button in video rooms but not in
Expand Down
Loading