From 0097360396e4119aef05c089613e13036a99b990 Mon Sep 17 00:00:00 2001 From: Leonard Kim Date: Fri, 19 Jul 2019 12:35:47 -0700 Subject: [PATCH] feat(deep-linking): allow disabling through override --- config.js | 4 ++++ react/features/base/config/functions.any.js | 1 + react/features/deep-linking/functions.js | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config.js b/config.js index 8c3a442a8..17f0ad545 100644 --- a/config.js +++ b/config.js @@ -418,6 +418,10 @@ var config = { // use only. // _desktopSharingSourceDevice: 'sample-id-or-label' + // If true, any checks to handoff to another application will be prevented + // and instead the app will continue to display in the current browser. + // disableDeepLinking: false + // A property to disable the right click context menu for localVideo // the menu has option to flip the locally seen video for local presentations // disableLocalVideoFlip: false diff --git a/react/features/base/config/functions.any.js b/react/features/base/config/functions.any.js index 703e4f209..3ca9c42d4 100644 --- a/react/features/base/config/functions.any.js +++ b/react/features/base/config/functions.any.js @@ -91,6 +91,7 @@ const WHITELISTED_KEYS = [ 'disableAGC', 'disableAP', 'disableAudioLevels', + 'disableDeepLinking', 'disableH264', 'disableHPF', 'disableNS', diff --git a/react/features/deep-linking/functions.js b/react/features/deep-linking/functions.js index d4de8cfbf..909223179 100644 --- a/react/features/deep-linking/functions.js +++ b/react/features/deep-linking/functions.js @@ -51,7 +51,7 @@ export function getDeepLinkingPage(state) { const { room } = state['features/base/conference']; // Show only if we are about to join a conference. - if (!room) { + if (!room || state['features/base/config'].disableDeepLinking) { return Promise.resolve(); }