Merge pull request #8352 from jitsi/tavram/allow-tileview-disabling

feat(jaas) allow tile view to be disabled
jitsi · Jan 8, 2021 · 6f5534f · 6f5534f
2 parents 80d7898 + dd8b220
commit 6f5534f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/config.js b/config.js
@@ -623,6 +623,9 @@ var config = {
     // otherwise the app doesn't render it.
     // moderatedRoomServiceUrl: 'https://moderated.jitsi-meet.example.com',
 
+    // If true, tile view will not be enabled automatically when the participants count threshold is reached.
+    // disableTileView: true,
+
     // Hides the conference subject
     // hideConferenceSubject: true
 

diff --git a/react/features/base/config/configWhitelist.js b/react/features/base/config/configWhitelist.js
@@ -91,6 +91,7 @@ export default [
     'disableRtx',
     'disableSimulcast',
     'disableThirdPartyRequests',
+    'disableTileView',
     'displayJids',
     'doNotStoreRoom',
     'e2eping',

diff --git a/react/features/video-layout/functions.js b/react/features/video-layout/functions.js
@@ -82,6 +82,12 @@ export function shouldDisplayTileView(state: Object = {}) {
         return false;
     }
 
+    const { disableTileView } = state['features/base/config'];
+
+    if (disableTileView) {
+        return false;
+    }
+
     const { tileViewEnabled } = state['features/video-layout'];
 
     if (tileViewEnabled !== undefined) {