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

feat(jaas) allow tile view to be disabled
This commit is contained in:
Avram Tudor 2021-01-08 16:03:21 +02:00 committed by GitHub
commit 6f5534fcb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions

View File

@ -623,6 +623,9 @@ var config = {
// otherwise the app doesn't render it. // otherwise the app doesn't render it.
// moderatedRoomServiceUrl: 'https://moderated.jitsi-meet.example.com', // 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 // Hides the conference subject
// hideConferenceSubject: true // hideConferenceSubject: true

View File

@ -91,6 +91,7 @@ export default [
'disableRtx', 'disableRtx',
'disableSimulcast', 'disableSimulcast',
'disableThirdPartyRequests', 'disableThirdPartyRequests',
'disableTileView',
'displayJids', 'displayJids',
'doNotStoreRoom', 'doNotStoreRoom',
'e2eping', 'e2eping',

View File

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