Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
Bigbluebutton
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IRIS NITK Surathkal
Bigbluebutton
Commits
49122392
Commit
49122392
authored
8 years ago
by
Fred Dixon
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bigbluebutton-client/resources/prod/BigBlueButton.html
+20
-3
20 additions, 3 deletions
bigbluebutton-client/resources/prod/BigBlueButton.html
with
20 additions
and
3 deletions
bigbluebutton-client/resources/prod/BigBlueButton.html
+
20
−
3
View file @
49122392
...
...
@@ -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
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment