From 9ad57127d4cbe2bddc9c87ff7ecd0d2dca5c4893 Mon Sep 17 00:00:00 2001 From: Christoph Settgast Date: Thu, 17 Mar 2022 13:56:43 +0100 Subject: [PATCH] feat: Use same recommendedBrowsers page for IE and browsers marked in interface_config.js (#10923) Reason: - This is easier overridable than then embedded react page - Consistenty between IE and other unsupported browsers --- .../DefaultUnsupportedDesktopBrowser.js | 68 ++++--------------- 1 file changed, 14 insertions(+), 54 deletions(-) diff --git a/react/features/unsupported-browser/components/DefaultUnsupportedDesktopBrowser.js b/react/features/unsupported-browser/components/DefaultUnsupportedDesktopBrowser.js index 69f11b56b..80836d3de 100644 --- a/react/features/unsupported-browser/components/DefaultUnsupportedDesktopBrowser.js +++ b/react/features/unsupported-browser/components/DefaultUnsupportedDesktopBrowser.js @@ -2,37 +2,22 @@ import React, { Component } from 'react'; -import { isBrowsersOptimal } from '../../base/environment'; -import { translate } from '../../base/i18n'; - -import { CHROME, FIREFOX } from './browserLinks'; - -/** - * The namespace of the CSS styles of UnsupportedDesktopBrowser. - * - * @private - * @type {string} - */ -const _SNS = 'unsupported-desktop-browser'; - -/** - * The type of the React {@code Component} props of - * {@link JaasUnsupportedDesktopBrowser}. - */ -type Props = { - - /** - * The function to translate human-readable text. - */ - t: Function -}; - /** * React component representing unsupported browser page. * - * @class UnsupportedDesktopBrowser + * @class DefaultUnsupportedDesktopBrowser */ -class JaasUnsupportedDesktopBrowser extends Component { +class DefaultUnsupportedDesktopBrowser extends Component { + + /** + * Redirects to the static recommended browsers page that is also used for IE. + * + * @returns {void} + */ + componentDidMount() { + window.location.href = '/static/recommendedBrowsers.html'; + } + /** * Renders the component. * @@ -40,34 +25,9 @@ class JaasUnsupportedDesktopBrowser extends Component { */ render() { return ( -
-

- It looks like you're using a browser we don't support. -

-

- Please try again with the latest version of  - Chrome  - { - this._showFirefox() && <>or Firefox - } -

-
+
); } - - /** - * Returns whether or not a link to download Firefox is displayed. - * - * @private - * @returns {boolean} - */ - _showFirefox() { - return isBrowsersOptimal('firefox'); - } } -export default translate(JaasUnsupportedDesktopBrowser); +export default DefaultUnsupportedDesktopBrowser;