From a902540167e89939b2caf6f398b14217dffabf99 Mon Sep 17 00:00:00 2001 From: damencho Date: Wed, 21 Mar 2018 16:48:36 -0500 Subject: [PATCH] Removes Firefox extension handle (removed in FF newer than latest ESR). --- conference.js | 6 ------ config.js | 14 -------------- lang/main.json | 2 -- modules/UI/UI.js | 10 ---------- 4 files changed, 32 deletions(-) diff --git a/conference.js b/conference.js index b04d49840..a9d84a6d4 100644 --- a/conference.js +++ b/conference.js @@ -1709,12 +1709,6 @@ export default { } ); - return; - } else if (error.name === JitsiTrackErrors.FIREFOX_EXTENSION_NEEDED) { - APP.UI.showExtensionRequiredDialog( - config.desktopSharingFirefoxExtensionURL - ); - return; } diff --git a/config.js b/config.js index a815c49cd..662a5c22f 100644 --- a/config.js +++ b/config.js @@ -150,23 +150,9 @@ var config = { // Required version of Chrome extension desktopSharingChromeMinExtVersion: '0.1', - // The ID of the jidesha extension for Firefox. If null, we assume that no - // extension is required. - desktopSharingFirefoxExtId: null, - // Whether desktop sharing should be disabled on Firefox. desktopSharingFirefoxDisabled: false, - // The maximum version of Firefox which requires a jidesha extension. - // Example: if set to 41, we will require the extension for Firefox versions - // up to and including 41. On Firefox 42 and higher, we will run without the - // extension. - // If set to -1, an extension will be required for all versions of Firefox. - desktopSharingFirefoxMaxVersionExtRequired: 51, - - // The URL to the Firefox extension for desktop sharing. - desktopSharingFirefoxExtensionURL: null, - // Optional desktop sharing frame rate options. Default value: min:5, max:5. // desktopSharingFrameRate: { // min: 5, diff --git a/lang/main.json b/lang/main.json index a0eba2ba9..ca113ffaa 100644 --- a/lang/main.json +++ b/lang/main.json @@ -278,8 +278,6 @@ "tokenAuthFailed": "Sorry, you're not allowed to join this call.", "displayNameRequired": "Display name is required", "enterDisplayName": "Please enter your display name", - "extensionRequired": "Extension required:", - "firefoxExtensionPrompt": "You need to install a Firefox extension in order to use screen sharing. Please try again after you get it from here!", "feedbackHelp": "Your feedback will help us to improve our video experience.", "feedbackQuestion": "Tell us about your call!", "thankYou": "Thank you for using __appName__!", diff --git a/modules/UI/UI.js b/modules/UI/UI.js index 5b5519f5a..ebd178d46 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -1039,16 +1039,6 @@ UI.getLargeVideo = function() { */ UI.isPinned = userId => VideoLayout.getPinnedId() === userId; -/** - * Shows dialog with a link to FF extension. - */ -UI.showExtensionRequiredDialog = function(url) { - messageHandler.openMessageDialog( - 'dialog.extensionRequired', - '[html]dialog.firefoxExtensionPrompt', - { url }); -}; - /** * Shows "Please go to chrome webstore to install the desktop sharing extension" * 2 button dialog with buttons - cancel and go to web store.