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

Merge pull request #6742 from capilkey/2.2-fix-flash-browser-detection

Browse Source 
Use bowser for browser detection - 2.2 Edition
This commit is contained in:
Richard Alam 2019-02-09 10:07:58 -05:00 committed by GitHub
commit bce0b62c11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 49 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/resources/prod/BigBlueButton.html
View File

@ -23,6 +23,7 @@
}
</style>
<script src="lib/bowser.js?v=VERSION" language="javascript"></script>
<script src="lib/bbb_blinker.js?v=VERSION" language="javascript"></script>
<script type="text/javascript" src="swfobject/swfobject.js"></script>
@ -149,7 +150,6 @@
<script src="lib/sip.js?v=VERSION" language="javascript"></script>
<!-- <script src="lib/webrtc_stats_bridge.js?v=VERSION" language="javascript"></script> -->
<script src="lib/bowser.js?v=VERSION" language="javascript"></script>
<script src="lib/bbb_webrtc_bridge_sip.js?v=VERSION" language="javascript"></script>
<script src="lib/weburl_regex.js?v=VERSION" language="javascript"></script>
<script src="lib/jsnlog.min.js?v=VERSION" language="javascript"></script>

70
bigbluebutton-client/resources/prod/lib/bbb_blinker.js
View File

@ -30,7 +30,7 @@ function determineModifier()
else if (browser == "Chrome"){
modifier = "control+";
}
else if (browser == "Microsoft Internet Explorer"){
else if (browser == "Internet Explorer"){
modifier = "control+shift+";
}
//else if (browser == "Safari"){
@ -52,7 +52,7 @@ function determineGlobalModifier()
else if (browser == "Chrome"){
modifier = "control+shift+";
}
else if (browser == "Microsoft Internet Explorer"){
else if (browser == "Internet Explorer"){
modifier = "control+alt+";
}
//else if (browser == "Safari"){
@ -74,7 +74,7 @@ function determineGlobalAlternateModifier()
else if (browser == "Chrome"){
modifier = "control+";
}
else if (browser == "Microsoft Internet Explorer"){
else if (browser == "Internet Explorer"){
modifier = "control+shift+";
}
//else if (browser == "Safari"){
@ -88,64 +88,10 @@ function determineGlobalAlternateModifier()
function determineBrowser()
{
// Browser name extraction code provided by http://www.javascripter.net/faq/browsern.htm
var nVer = navigator.appVersion;
var nAgt = navigator.userAgent;
var browserName = navigator.appName;
var fullVersion = ''+parseFloat(navigator.appVersion);
var majorVersion = parseInt(navigator.appVersion,10);
var nameOffset,verOffset,ix;
// In Opera, the true version is after "Opera" or after "Version"
if ((verOffset=nAgt.indexOf("OPR/"))!=-1) {
browserName = "Opera";
fullVersion = nAgt.substring(verOffset+4);
}
// In MSIE, the true version is after "MSIE" in userAgent
else if ((verOffset=nAgt.indexOf("MSIE"))!=-1) {
browserName = "Microsoft Internet Explorer";
fullVersion = nAgt.substring(verOffset+5);
}
// In Puffin, the true version is after "Puffin" in userAgent
else if ((verOffset=nAgt.indexOf("Puffin"))!=-1) {
browserName = "Puffin";
fullVersion = nAgt.substring(verOffset+7);
}
// search for Edge before Chrome or Safari because Microsoft
// includes Chrome and Safari user agents in Edge's UA
// In Microsoft Edge, the true version is the last chunk of the UA
// it follows "Edge"
else if ((verOffset=nAgt.indexOf("Edge"))!=-1) {
browserName = "Edge";
// "Edge".length = 4, plus 1 character for the trailing slash
fullVersion = nAgt.substring(verOffset+5);
}
// In Chrome, the true version is after "Chrome"
else if ((verOffset=nAgt.indexOf("Chrome"))!=-1) {
browserName = "Chrome";
fullVersion = nAgt.substring(verOffset+7);
}
// In Safari, the true version is after "Safari" or after "Version"
else if ((verOffset=nAgt.indexOf("Safari"))!=-1) {
browserName = "Safari";
fullVersion = nAgt.substring(verOffset+7);
if ((verOffset=nAgt.indexOf("Version"))!=-1)
fullVersion = nAgt.substring(verOffset+8);
}
// In Firefox, the true version is after "Firefox"
else if ((verOffset=nAgt.indexOf("Firefox"))!=-1) {
browserName = "Firefox";
fullVersion = nAgt.substring(verOffset+8);
}
// In most other browsers, "name/version" is at the end of userAgent
else if ( (nameOffset=nAgt.lastIndexOf(' ')+1) < (verOffset=nAgt.lastIndexOf('/')) )
{
browserName = nAgt.substring(nameOffset,verOffset);
fullVersion = nAgt.substring(verOffset+1);
if (browserName.toLowerCase()==browserName.toUpperCase()) {
browserName = navigator.appName;
}
}
var browserName = bowser.name;
var fullVersion = bowser.version;
var userAgent = navigator.userAgent;
// trim the fullVersion string at semicolon/space if present
if ((ix=fullVersion.indexOf(";"))!=-1)
fullVersion=fullVersion.substring(0,ix);
@ -158,7 +104,7 @@ function determineBrowser()
majorVersion = parseInt(navigator.appVersion,10);
}
return [browserName, majorVersion, fullVersion];
return [browserName, majorVersion, fullVersion, userAgent];
}
function toggleFullscreen() {

1
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
View File

@ -246,6 +246,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
browser.name = BrowserCheck.browserName;
browser.majorVersion = BrowserCheck.browserMajorVersion;
browser.fullVersion = BrowserCheck.browserFullVersion;
browser.userAgent = BrowserCheck.userAgent;
var logData:Object = UsersUtil.initLogData();
logData.tags = ["initialization"];

61
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
View File

@ -49,33 +49,34 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<fx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.common.events.LocaleChangeEvent;
import org.bigbluebutton.core.BBB;
import org.bigbluebutton.core.Options;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.managers.ReconnectionManager;
import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.main.events.MadePresenterEvent;
import org.bigbluebutton.main.events.ShortcutEvent;
import org.bigbluebutton.main.views.MainCanvas;
import org.bigbluebutton.modules.screenshare.events.RequestToPauseSharing;
import org.bigbluebutton.modules.screenshare.events.RequestToRestartSharing;
import org.bigbluebutton.modules.screenshare.events.RequestToStopSharing;
import org.bigbluebutton.modules.screenshare.events.ScreenSharePausedEvent;
import org.bigbluebutton.modules.screenshare.events.ShareStartEvent;
import org.bigbluebutton.modules.screenshare.events.ShareStoppedEvent;
import org.bigbluebutton.modules.screenshare.events.ShareWindowEvent;
import org.bigbluebutton.modules.screenshare.events.StartShareRequestSuccessEvent;
import org.bigbluebutton.modules.screenshare.events.StopSharingButtonEvent;
import org.bigbluebutton.modules.screenshare.events.ViewStreamEvent;
import org.bigbluebutton.modules.screenshare.model.ScreenshareModel;
import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions;
import org.bigbluebutton.modules.screenshare.services.red5.Connection;
import org.bigbluebutton.util.i18n.ResourceUtil;
import com.asfusion.mate.events.Dispatcher;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.common.events.LocaleChangeEvent;
import org.bigbluebutton.core.BBB;
import org.bigbluebutton.core.Options;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.core.managers.ReconnectionManager;
import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.main.events.MadePresenterEvent;
import org.bigbluebutton.main.events.ShortcutEvent;
import org.bigbluebutton.main.views.MainCanvas;
import org.bigbluebutton.modules.screenshare.events.RequestToPauseSharing;
import org.bigbluebutton.modules.screenshare.events.RequestToRestartSharing;
import org.bigbluebutton.modules.screenshare.events.RequestToStopSharing;
import org.bigbluebutton.modules.screenshare.events.ScreenSharePausedEvent;
import org.bigbluebutton.modules.screenshare.events.ShareStartEvent;
import org.bigbluebutton.modules.screenshare.events.ShareStoppedEvent;
import org.bigbluebutton.modules.screenshare.events.ShareWindowEvent;
import org.bigbluebutton.modules.screenshare.events.StartShareRequestSuccessEvent;
import org.bigbluebutton.modules.screenshare.events.StopSharingButtonEvent;
import org.bigbluebutton.modules.screenshare.events.ViewStreamEvent;
import org.bigbluebutton.modules.screenshare.model.ScreenshareModel;
import org.bigbluebutton.modules.screenshare.model.ScreenshareOptions;
import org.bigbluebutton.modules.screenshare.services.red5.Connection;
import org.bigbluebutton.util.browser.BrowserCheck;
import org.bigbluebutton.util.i18n.ResourceUtil;
private static const LOGGER:ILogger = getClassLogger(ScreensharePublishWindow);
@ -127,10 +128,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
} else if (fullOS.indexOf("Linux") != -1) {
os = "Linux";
} else {
LOGGER.error("Browser not recognized, full value: {0}", [fullOS]);
LOGGER.error("OS not recognized, full value: {0}", [fullOS]);
os = "";
}
browser = BrowserCheck.browserName;
windowControls.maximizeRestoreBtn.enabled = false;
titleBarOverlay.tabIndex = dsOptions.baseTabIndex;
@ -549,7 +552,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (os == "Windows") {
shareTypeBox.visible = true;
info = "PC";
if (browser == "Microsoft Internet Explorer" || browser == "Edge") {
if (browser == "Internet Explorer" || browser == "Edge") {
info += "IE";
} else if (browser == "Firefox") {
info += "Firefox";

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

@ -33,6 +33,8 @@ package org.bigbluebutton.util.browser {
private static var _majorVersion:String;
private static var _fullVersion:String;
private static var _userAgent:String;
// The function below is called in $cinit, while the class is used for the first time.
getBrowserInfo();
@ -53,6 +55,10 @@ package org.bigbluebutton.util.browser {
public static function get browserFullVersion():String {
return _fullVersion;
}
public static function get userAgent():String {
return _userAgent;
}
public static function isChrome():Boolean {
return _browserName.toLowerCase() == "chrome";
@ -89,6 +95,7 @@ package org.bigbluebutton.util.browser {
_browserName = browserInfo[0];
_majorVersion = String(browserInfo[1]);
_fullVersion = String(browserInfo[2]);
_userAgent = String(browserInfo[3]);
} else {
_browserName = "unknown";
_majorVersion = "0";