36bbcc06d6
Conflicts: akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java bbb-video/.classpath bbb-video/build.gradle bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java bbb-video/src/main/webapp/WEB-INF/red5-web.xml 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/ParticipantsListener.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/es_LA/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/src/BigBlueButton.mxml bigbluebutton-client/src/SharedNotesModule.mxml bigbluebutton-client/src/org/bigbluebutton/common/Images.as bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.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/managers/PresentManager.as bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as bigbluebutton-config/bigbluebutton-release bigbluebutton-config/bin/bbb-conf bigbluebutton-config/web/index.html bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
181 lines
7.3 KiB
HTML
Executable File
181 lines
7.3 KiB
HTML
Executable File
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
|
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
|
<head>
|
|
<title></title>
|
|
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
|
<style type="text/css" media="screen">
|
|
html, body, #content { height:100%; }
|
|
body { margin:0; padding:0; overflow:hidden; }
|
|
#altContent { /* style alt content */ }
|
|
.visually-hidden {
|
|
position: absolute !important;
|
|
clip: rect(1px 1px, 1px, 1px);
|
|
clip: rect(1px, 1px, 1px, 1px);
|
|
padding: 0 !important;
|
|
border: 0 !important;
|
|
height: 1px !important;
|
|
width: 1px !important;
|
|
overflow: hidden;
|
|
}
|
|
|
|
#deployJavaPlugin {
|
|
display : none;
|
|
}
|
|
</style>
|
|
|
|
<script type="text/javascript" src="swfobject/swfobject.js"></script>
|
|
<script src="lib/deployJava.js?v=VERSION" language="javascript"></script>
|
|
<script type="text/javascript">
|
|
// Check for Firefox 41.0.1/2 to workaround Flash hang
|
|
// See https://bugzilla.mozilla.org/show_bug.cgi?id=1210665
|
|
var ffHangWorkaround = function() {
|
|
if (navigator.userAgent.indexOf("Windows") != -1 &&
|
|
(navigator.userAgent.indexOf("Firefox/41.0") != -1 &&
|
|
navigator.buildID > "20150928" &&
|
|
navigator.buildID < "20151015")) {
|
|
console.log("Browser appears to be Firefox 41.0.1 or .2 on Windows");
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
//swfobject.registerObject("BigBlueButton", "11", "expressInstall.swf");
|
|
var flashvars = {};
|
|
var params = {};
|
|
params.quality = "high";
|
|
params.bgcolor = "#869ca7";
|
|
params.allowfullscreen = "true";
|
|
params.allowfullscreeninteractive = "true";
|
|
|
|
if (ffHangWorkaround()) {
|
|
console.log("Applying Firefox Flash hang workaround");
|
|
// wmode = opaque causes button clicks to be sometimes unresponsive,
|
|
// and right-click in particular is unreliable. It disables Flash
|
|
// permission prompts on Linux (causing webcams, flash voice to be
|
|
// unusable there). But it's better than a browser hang...
|
|
params.wmode = "opaque";
|
|
} else {
|
|
params.wmode = "window";
|
|
}
|
|
params.allowscriptaccess = "true";
|
|
params.seamlesstabbing = "true";
|
|
var attributes = {};
|
|
attributes.id = "BigBlueButton";
|
|
attributes.name = "BigBlueButton";
|
|
attributes.align = "middle";
|
|
attributes.tabIndex = 0;
|
|
swfobject.embedSWF("BigBlueButton.swf?v=VERSION", "altFlash", "100%", "100%", "11.0.0", "expressInstall.swf", flashvars, params, attributes, embedCallback);
|
|
|
|
function embedCallback(e) {
|
|
// Work around pixel alignment bug with Chrome 21 on Mac.
|
|
// See: http://code.google.com/p/bigbluebutton/issues/detail?id=1294
|
|
var objs = $('object');
|
|
objs.each(function(i, o) {
|
|
var o = $(o);
|
|
var top = o.offset().top;
|
|
var left = o.offset().left;
|
|
var roundtop = Math.round(top);
|
|
var roundleft = Math.round(left);
|
|
o.css("position", "relative");
|
|
if (roundtop === top) {
|
|
} else {
|
|
o.css("top", roundtop - top);
|
|
}
|
|
if (roundleft === left) {
|
|
} else {
|
|
o.css("left", roundleft - left);
|
|
}
|
|
});
|
|
}
|
|
</script>
|
|
<script src="lib/jquery-1.5.1.min.js?v=VERSION" language="javascript"></script>
|
|
<script src="lib/bbblogger.js?v=VERSION" language="javascript"></script>
|
|
<script src="lib/bigbluebutton.js?v=VERSION" language="javascript"></script>
|
|
<script src="lib/bbb_localization.js?v=VERSION" language="javascript"></script>
|
|
<script src="lib/bbb_blinker.js?v=VERSION" language="javascript"></script>
|
|
<script src="lib/bbb_deskshare.js?v=VERSION" language="javascript"></script>
|
|
<script src="lib/bbb_api_bridge.js?v=VERSION" language="javascript"></script>
|
|
<script src="lib/sip.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>
|
|
<script src="lib/diff_match_patch_uncompressed.js?v=VERSION" language="javascript"></script>
|
|
<script src="lib/shared_notes.js?v=VERSION" language="javascript"></script>
|
|
<script>
|
|
window.chatLinkClicked = function(url) {
|
|
window.open(url, '_blank');
|
|
window.focus();
|
|
}
|
|
</script>
|
|
<script type="text/javascript">
|
|
window.onload = function() {
|
|
var checkRequest = $.ajax({
|
|
dataType: 'json',
|
|
url: '/html5client/check'
|
|
});
|
|
checkRequest.done(function(data) {
|
|
if(typeof data.html5clientStatus !== "undefined" && data.html5clientStatus === "running") {
|
|
document.getElementById('html5Section').style.display='inherit';
|
|
}
|
|
});
|
|
};
|
|
|
|
function html5() {
|
|
// no Flash detected on the client
|
|
var originalPath, enterRequest, authToken, meetingId, userId;
|
|
originalPath = document.location.pathname;
|
|
|
|
// use the enter api to detect the meetingid, userid and authToken
|
|
// and reuse them to join via the HTML5 client
|
|
enterRequest = $.ajax({
|
|
dataType: 'json',
|
|
url: '/bigbluebutton/api/enter'
|
|
});
|
|
|
|
enterRequest.done(function(enterData) {
|
|
meetingId = enterData.response.meetingID;
|
|
userId = enterData.response.externUserID;
|
|
authToken = enterData.response.authToken;
|
|
|
|
if ((meetingId != null) && (userId != null) && (authToken != null)) {
|
|
// redirect to the html5 client with the received info
|
|
// format <IP>/html5client/<meetingId>/<userId>/<authToken>
|
|
document.location.pathname = "/html5client/"+meetingId+"/"+userId+"/"+authToken;
|
|
} else {
|
|
// go back to the redirection page
|
|
document.location.pathname = originalPath;
|
|
}
|
|
});
|
|
|
|
enterRequest.fail(function(enterData, textStatus, errorThrown){
|
|
BBBLog.debug("Enter request failed");
|
|
});
|
|
}
|
|
</script>
|
|
</head>
|
|
|
|
<body>
|
|
<div>
|
|
<audio id="remote-media" autoplay="autoplay"></audio>
|
|
</div>
|
|
|
|
<div id="content">
|
|
<div id="altFlash" style="width:50%; margin-left: auto; margin-right: auto; ">
|
|
<h2>You need Flash installed and enabled in order to use the Flash client.</h2>
|
|
<br/>
|
|
<div style="width:50%; margin-left: auto; margin-right: auto; ">
|
|
<a href="http://www.adobe.com/go/getflashplayer">
|
|
<img src="//www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
|
|
</a>
|
|
<div id="html5Section" style="display:none">
|
|
<p style="margin-left:50px;" >OR</p>
|
|
<button type="button" onclick="html5();"><h3>Launch the HTML5 client instead</h3></button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<button id="enterFlash" type="button" class="visually-hidden" onclick="startFlashFocus();" value="Click to focus the client"></button>
|
|
<div id="clientReady" aria-atomic="false" aria-live="polite"></div>
|
|
</body>
|
|
</html>
|