Avoid flashing the 'join conference' button at the user in video rooms (#22120)

robintown · web-flow · commit 1783645108b8 · 2022-05-09T15:22:45.000+01:00
diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts
@@ -241,7 +241,9 @@ function switchVisibleContainers() {
 
 function toggleConferenceVisibility(inConference: boolean) {
     document.getElementById("jitsiContainer").style.visibility = inConference ? 'unset' : 'hidden';
-    document.getElementById("joinButtonContainer").style.visibility = inConference ? 'hidden' : 'unset';
+    // 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';
 }
 
 function skipToJitsiSplashScreen() {

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,9 @@ function switchVisibleContainers() {`
`241`	`241`
`242`	`242`	`function toggleConferenceVisibility(inConference: boolean) {`
`243`	`243`	`document.getElementById("jitsiContainer").style.visibility = inConference ? 'unset' : 'hidden';`
`244`		`- document.getElementById("joinButtonContainer").style.visibility = inConference ? 'hidden' : 'unset';`
	`244`	`+ // Video rooms have a separate UI for joining, so they should never show our join button`
	`245`	`+ document.getElementById("joinButtonContainer").style.visibility =`
	`246`	`+ (inConference \|\| isVideoChannel) ? 'hidden' : 'unset';`
`245`	`247`	`}`
`246`	`248`
`247`	`249`	`function skipToJitsiSplashScreen() {`