Skip to content
Snippets Groups Projects
Commit 49122392 authored by Fred Dixon's avatar Fred Dixon Committed by GitHub
Browse files

Merge pull request #3557 from capilkey/backport-3519

Backported #3519 to 1.0 so Chrome works better
parents ad746beb 757c4070
Branches v1.0.x-release
No related tags found
No related merge requests found
......@@ -23,6 +23,7 @@
}
</style>
<script src="lib/bbb_blinker.js?v=VERSION" language="javascript"></script>
<script type="text/javascript" src="swfobject/swfobject.js"></script>
<script src="lib/deployJava.js?v=VERSION" language="javascript"></script>
<script type="text/javascript">
......@@ -62,8 +63,23 @@
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);
// In Chrome 56 Google started blocking Flash by default so we force the SWF to
// be loaded in the DOM rather than relying on the SWFObject code to detect
// Flash because it can't.
var browserInfo = determineBrowser();
if (browserInfo && browserInfo[0] === "Chrome") {
// Added a sort of callback idea because when this script runs "content" doesn't exist yet
var fillContent = function(){
var content = document.getElementById("content");
if (content) {
content.innerHTML = '<object type="application/x-shockwave-flash" id="BigBlueButton" name="BigBlueButton" tabindex="0" data="BigBlueButton.swf?v=VERSION" style="position: relative; top: 0.5px;" width="100%" height="100%" align="middle"><param name="quality" value="high"><param name="bgcolor" value="#869ca7"><param name="allowfullscreen" value="true"><param name="wmode" value="window"><param name="allowscriptaccess" value="true"><param name="seamlesstabbing" value="true"></object>';
}
};
} else {
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
......@@ -90,7 +106,6 @@
<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>
......@@ -114,6 +129,8 @@
document.getElementById('html5Section').style.display='inherit';
}
});
if (fillContent) fillContent();
};
function html5() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment