From 03cf7ca6988fed6f441f16a3fb10a2f83951e2e4 Mon Sep 17 00:00:00 2001 From: Timo K Date: Tue, 16 Jan 2024 16:03:45 +0100 Subject: [PATCH 1/4] Use jitsi-lobby in video channel Signed-off-by: Timo K --- src/vector/jitsi/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 6584b76a5e..3fb45404c9 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -294,7 +294,7 @@ 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"; + inConference ? "hidden" : "unset"; } function skipToJitsiSplashScreen(): void { @@ -452,7 +452,7 @@ async function joinConference(audioInput?: string | null, videoInput?: string | if (isVideoChannel) { // Ensure that we skip Jitsi Meet's native prejoin screen, for // deployments that have it enabled - options.configOverwrite!.prejoinConfig = { enabled: false }; + 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 From 872b7f5110accda53cf2f9c30cf61e32e1417c06 Mon Sep 17 00:00:00 2001 From: Timo K Date: Tue, 16 Jan 2024 20:16:44 +0100 Subject: [PATCH 2/4] update comment Signed-off-by: Timo K --- src/vector/jitsi/index.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 3fb45404c9..c4a41854f5 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -293,8 +293,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 ? "hidden" : "unset"; + document.getElementById("joinButtonContainer")!.style.visibility = inConference ? "hidden" : "unset"; } function skipToJitsiSplashScreen(): void { @@ -450,8 +449,7 @@ 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 + // 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"]; From feab5057bd970b1ddd9f71432d33bd9775de6929 Mon Sep 17 00:00:00 2001 From: Timo K Date: Fri, 19 Jan 2024 14:36:25 +0100 Subject: [PATCH 3/4] review Signed-off-by: Timo K --- src/vector/jitsi/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index c4a41854f5..5d96cef2d6 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -292,8 +292,6 @@ 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 ? "hidden" : "unset"; } function skipToJitsiSplashScreen(): void { From 8ab44c98b2acd009e3558ba8f78c5ffd1952ba13 Mon Sep 17 00:00:00 2001 From: Timo K Date: Tue, 23 Jan 2024 14:13:01 +0100 Subject: [PATCH 4/4] maintain behavior for non video rooms Signed-off-by: Timo K --- src/vector/jitsi/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 5d96cef2d6..1d3a54b41c 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -292,6 +292,7 @@ function switchVisibleContainers(): void { function toggleConferenceVisibility(inConference: boolean): void { document.getElementById("jitsiContainer")!.style.visibility = inConference ? "unset" : "hidden"; + document.getElementById("joinButtonContainer")!.style.visibility = inConference ? "hidden" : "unset"; } function skipToJitsiSplashScreen(): void {