BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6609 from capilkey/2.2-edge-webrtc

Browse Source 
[2.2] Remove WebRTC blocks for Edge and update adapter.js
This commit is contained in:
Chad Pilkey 2019-01-25 14:47:21 -05:00 committed by GitHub
commit 4e2f876f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3384 additions and 2654 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6026
bigbluebutton-client/resources/prod/lib/adapter.js
View File

File diff suppressed because it is too large Load Diff

6
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
View File

@ -588,11 +588,7 @@ function releaseUserMedia() {
} }
function isWebRTCAvailable() { function isWebRTCAvailable() {
if (bowser.msedge) { return SIP.WebRTC.isSupported();
return false;
} else {
return SIP.WebRTC.isSupported();
}
} }
function getCallStatus() { function getCallStatus() {

2
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/utils/WebRTCScreenshareUtility.as
View File

@ -110,6 +110,8 @@ package org.bigbluebutton.modules.screenshare.utils
ExternalInterface.addCallback("onSuccess", onSuccess); ExternalInterface.addCallback("onSuccess", onSuccess);
// check if the extension exists // check if the extension exists
ExternalInterface.call("checkChromeExtInstalled", "onSuccess", WebRTCScreenshareUtility.chromeExtensionKey); ExternalInterface.call("checkChromeExtInstalled", "onSuccess", WebRTCScreenshareUtility.chromeExtensionKey);
} else if (BrowserCheck.isEdge()) {
webRTCWorksAndConfigured("Edge, lets try");
} else { } else {
cannotUseWebRTC("Web browser doesn't support WebRTC"); cannotUseWebRTC("Web browser doesn't support WebRTC");
return; return;

4
bigbluebutton-client/src/org/bigbluebutton/util/browser/BrowserCheck.as
View File

@ -65,6 +65,10 @@ package org.bigbluebutton.util.browser {
public static function isFirefox():Boolean { public static function isFirefox():Boolean {
return _browserName.toLowerCase() == "firefox"; return _browserName.toLowerCase() == "firefox";
} }
public static function isEdge():Boolean {
return _browserName.toLowerCase() == "edge";
}
public static function isPuffinBelow46():Boolean { public static function isPuffinBelow46():Boolean {
return _browserName.toLowerCase() == "puffin" && String(_fullVersion).substr(0, 3) < "4.6"; return _browserName.toLowerCase() == "puffin" && String(_fullVersion).substr(0, 3) < "4.6";