Merge pull request #8400 from jitsi/tavram/shortcuts
feat(external_api) allow shortcuts to be disabled
This commit is contained in:
commit
c6bb600d4c
|
@ -2382,7 +2382,9 @@ export default {
|
||||||
_onConferenceJoined() {
|
_onConferenceJoined() {
|
||||||
APP.UI.initConference();
|
APP.UI.initConference();
|
||||||
|
|
||||||
APP.keyboardshortcut.init();
|
if (!config.disableShortcuts) {
|
||||||
|
APP.keyboardshortcut.init();
|
||||||
|
}
|
||||||
|
|
||||||
APP.store.dispatch(conferenceJoined(room));
|
APP.store.dispatch(conferenceJoined(room));
|
||||||
},
|
},
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -90,6 +90,7 @@ export default [
|
||||||
'disableRemoteControl',
|
'disableRemoteControl',
|
||||||
'disableRemoteMute',
|
'disableRemoteMute',
|
||||||
'disableRtx',
|
'disableRtx',
|
||||||
|
'disableShortcuts',
|
||||||
'disableSimulcast',
|
'disableSimulcast',
|
||||||
'disableThirdPartyRequests',
|
'disableThirdPartyRequests',
|
||||||
'disableTileView',
|
'disableTileView',
|
||||||
|
|
Loading…
Reference in New Issue