7cb12f8b49
Conflicts: bbb-api-demo/src/main/webapp/demo10_helper.jsp bbb-video/build.gradle bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml bigbluebutton-client/locale/bg_BG/bbbResources.properties bigbluebutton-client/locale/cs_CZ/bbbResources.properties bigbluebutton-client/locale/cy_GB/bbbResources.properties bigbluebutton-client/locale/de_DE/bbbResources.properties bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/es_419/bbbResources.properties bigbluebutton-client/locale/es_ES/bbbResources.properties bigbluebutton-client/locale/et_EE/bbbResources.properties bigbluebutton-client/locale/fa_IR/bbbResources.properties bigbluebutton-client/locale/fr_CA/bbbResources.properties bigbluebutton-client/locale/fr_FR/bbbResources.properties bigbluebutton-client/locale/hu_HU/bbbResources.properties bigbluebutton-client/locale/hy_AM/bbbResources.properties bigbluebutton-client/locale/it_IT/bbbResources.properties bigbluebutton-client/locale/ms_MY/bbbResources.properties bigbluebutton-client/locale/no_NO/bbbResources.properties bigbluebutton-client/locale/pl_PL/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/locale/ru_RU/bbbResources.properties bigbluebutton-client/locale/sk_SK/bbbResources.properties bigbluebutton-client/locale/tr_TR/bbbResources.properties bigbluebutton-client/locale/uk_UA/bbbResources.properties bigbluebutton-client/locale/zh_CN/bbbResources.properties bigbluebutton-client/resources/config.xml.template bigbluebutton-client/resources/prod/MconfLive.html bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js bigbluebutton-client/resources/prod/lib/deployJava.js bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml bigbluebutton-config/web/index.html bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
115 lines
3.3 KiB
JavaScript
Executable File
115 lines
3.3 KiB
JavaScript
Executable File
function setTitle(title){
|
|
document.title= title;
|
|
}
|
|
|
|
function clientReady(message){
|
|
var target = document.getElementById("clientReady");
|
|
if (target) target.innerHTML = message;
|
|
}
|
|
|
|
function determineModifier()
|
|
{
|
|
var browser = determineBrowser()[0];
|
|
var modifier;
|
|
if (browser == "Firefox"){
|
|
modifier = "control+";
|
|
}
|
|
else if (browser == "Chrome"){
|
|
modifier = "control+";
|
|
}
|
|
else if (browser == "Microsoft Internet Explorer"){
|
|
modifier = "control+shift+";
|
|
}
|
|
//else if (browser == "Safari"){
|
|
// modifier = "control+shift+";
|
|
//}
|
|
else{
|
|
modifier = "control+shift+";
|
|
}
|
|
return modifier;
|
|
}
|
|
|
|
function determineGlobalModifier()
|
|
{
|
|
var browser = determineBrowser()[0];
|
|
var modifier;
|
|
if (browser == "Firefox"){
|
|
modifier = "control+shift+";
|
|
}
|
|
else if (browser == "Chrome"){
|
|
modifier = "control+shift+";
|
|
}
|
|
else if (browser == "Microsoft Internet Explorer"){
|
|
modifier = "control+alt+";
|
|
}
|
|
//else if (browser == "Safari"){
|
|
// modifier = "control+alt";
|
|
//}
|
|
else{
|
|
modifier = "control+alt+";
|
|
}
|
|
return modifier;
|
|
}
|
|
|
|
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("Opera"))!=-1) {
|
|
browserName = "Opera";
|
|
fullVersion = nAgt.substring(verOffset+6);
|
|
if ((verOffset=nAgt.indexOf("Version"))!=-1)
|
|
fullVersion = nAgt.substring(verOffset+8);
|
|
}
|
|
// 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 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;
|
|
}
|
|
}
|
|
// trim the fullVersion string at semicolon/space if present
|
|
if ((ix=fullVersion.indexOf(";"))!=-1)
|
|
fullVersion=fullVersion.substring(0,ix);
|
|
if ((ix=fullVersion.indexOf(" "))!=-1)
|
|
fullVersion=fullVersion.substring(0,ix);
|
|
|
|
majorVersion = parseInt(''+fullVersion,10);
|
|
if (isNaN(majorVersion)) {
|
|
fullVersion = ''+parseFloat(navigator.appVersion);
|
|
majorVersion = parseInt(navigator.appVersion,10);
|
|
}
|
|
|
|
return [browserName, majorVersion];
|
|
} |