haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8400 from jitsi/tavram/shortcuts 

feat(external_api) allow shortcuts to be disabled
This commit is contained in:
Avram Tudor 2021-01-13 12:39:27 +02:00 committed by GitHub
parent 845e23a947 55ebb60f85
commit c6bb600d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conference.js
View File

@ -2382,7 +2382,9 @@ export default {
_onConferenceJoined() { _onConferenceJoined() {
APP.UI.initConference(); APP.UI.initConference();
if (!config.disableShortcuts) {
APP.keyboardshortcut.init(); APP.keyboardshortcut.init();
}
APP.store.dispatch(conferenceJoined(room)); APP.store.dispatch(conferenceJoined(room));
}, },

3
config.js
View File

@ -336,6 +336,9 @@ var config = {
// will be joined when no room is specified. // will be joined when no room is specified.
enableWelcomePage: true, enableWelcomePage: true,
// Disable app shortcuts that are registered upon joining a conference
// disableShortcuts: false,
// Disable initial browser getUserMedia requests. // Disable initial browser getUserMedia requests.
// This is useful for scenarios where users might want to start a conference for screensharing only // This is useful for scenarios where users might want to start a conference for screensharing only
// disableInitialGUM: false, // disableInitialGUM: false,

1
react/features/base/config/configWhitelist.js
View File

@ -90,6 +90,7 @@ export default [
'disableRemoteControl', 'disableRemoteControl',
'disableRemoteMute', 'disableRemoteMute',
'disableRtx', 'disableRtx',
'disableShortcuts',
'disableSimulcast', 'disableSimulcast',
'disableThirdPartyRequests', 'disableThirdPartyRequests',
'disableTileView', 'disableTileView',