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

Merge pull request #4121 from jitsi/remove-edge-support 

Removes Edge support.
This commit is contained in:
Дамян Минков 2019-04-23 20:32:17 +00:00 committed by GitHub
parent b7198ba4b3 43a0ae578e
commit 37639a5614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -8615,8 +8615,8 @@
}
},
"lib-jitsi-meet": {
"version": "github:jitsi/lib-jitsi-meet#1c5fd72b2a88d4214ccd17a1da60413ae944c862",
"from": "github:jitsi/lib-jitsi-meet#1c5fd72b2a88d4214ccd17a1da60413ae944c862",
"version": "github:jitsi/lib-jitsi-meet#158243c29751d3892414125f79e72aeaadd2ec25",
"from": "github:jitsi/lib-jitsi-meet#158243c29751d3892414125f79e72aeaadd2ec25",
"requires": {
"@jitsi/sdp-interop": "0.1.14",
"@jitsi/sdp-simulcast": "0.2.1",
@ -8628,8 +8628,7 @@
"sdp-transform": "2.3.0",
"strophe.js": "1.2.16",
"strophejs-plugin-disco": "0.0.2",
"webrtc-adapter": "github:webrtc/adapter#1eec19782b4058d186341263e7d049cea3e3290a",
"yaeti": "1.0.1"
"webrtc-adapter": "github:webrtc/adapter#1eec19782b4058d186341263e7d049cea3e3290a"
},
"dependencies": {
"js-md5": {
@ -16595,11 +16594,6 @@
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
},
"yaeti": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/yaeti/-/yaeti-1.0.1.tgz",
"integrity": "sha1-IX0Eu83LvYbMR45GVapMKMST3r8="
},
"yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",

2
package.json
View File

@ -51,7 +51,7 @@
"js-utils": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
"jsrsasign": "8.0.12",
"jwt-decode": "2.2.0",
"lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#1c5fd72b2a88d4214ccd17a1da60413ae944c862",
"lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#158243c29751d3892414125f79e72aeaadd2ec25",
"libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
"lodash": "4.17.11",
"moment": "2.19.4",

25
react/features/unsupported-browser/components/UnsupportedDesktopBrowser.js
View File

@ -5,7 +5,7 @@ import React, { Component } from 'react';
import { translate } from '../../base/i18n';
import { Platform } from '../../base/react';
import { CHROME, EDGE, FIREFOX, SAFARI } from './browserLinks';
import { CHROME, /* EDGE, */ FIREFOX, SAFARI } from './browserLinks';
/**
* The namespace of the CSS styles of UnsupportedDesktopBrowser.
@ -48,10 +48,10 @@ class UnsupportedDesktopBrowser extends Component<Props> {
Please try again with the latest version of&nbsp;
<a
className = { `${_SNS}__link` }
href = { CHROME } >Chrome</a>,&nbsp;
href = { CHROME } >Chrome</a> and&nbsp;
<a
className = { `${_SNS}__link` }
href = { FIREFOX }>Firefox</a> or&nbsp;
href = { FIREFOX }>Firefox</a>&nbsp;
{
this._renderOSSpecificBrowserDownloadLink()
}
@ -76,20 +76,25 @@ class UnsupportedDesktopBrowser extends Component<Props> {
text = 'Safari';
break;
/*
case 'windows':
link = EDGE;
text = 'Edge';
break;
*/
}
if (typeof link !== 'undefined') {
return (
<a
className = { `${_SNS}__link` }
href = { link }>
{
text
}
</a>
<span>
or&nbsp;
<a
className = { `${_SNS}__link` }
href = { link }>
{
text
}
</a>
</span>
);
}