Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
fairblue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hosting
chat
fairblue
Commits
452a1228
Commit
452a1228
authored
6 years ago
by
Anton Georgiev
Browse files
Options
Downloads
Patches
Plain Diff
improve signal for audio join/leave when in iframe
parent
56820bca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bbb-api-demo/src/main/webapp/demo_iframe.jsp
+0
-7
0 additions, 7 deletions
bbb-api-demo/src/main/webapp/demo_iframe.jsp
bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+2
-4
2 additions, 4 deletions
...uebutton-html5/imports/ui/services/audio-manager/index.js
with
2 additions
and
11 deletions
bbb-api-demo/src/main/webapp/demo_iframe.jsp
+
0
−
7
View file @
452a1228
...
...
@@ -137,7 +137,6 @@ function getInitialState() {
}
function
handleMessage
(
e
)
{
let
neverJoinedAudio
=
true
;
switch
(
e
)
{
case
'
readyToConnect
'
:
{
// get initial state
...
...
@@ -161,15 +160,9 @@ function handleMessage(e) {
case
'
notInAudio
'
:
{
muteButton
.
innerHTML
=
'
Not in audio
'
;
document
.
getElementById
(
'
muteButton
'
).
disabled
=
true
;
if
(
neverJoinedAudio
)
{
// poll every 1 sec to check if we joined audio
setTimeout
(
function
(){
document
.
getElementById
(
'
client-content
'
).
contentWindow
.
postMessage
(
'
get_audio_joined_status
'
,
'
*
'
);
},
1000
);}
break
;
}
case
'
joinedAudio
'
:
{
neverJoinedAudio
=
false
;
muteButton
.
innerHTML
=
''
;
document
.
getElementById
(
'
muteButton
'
).
disabled
=
false
;
document
.
getElementById
(
'
client-content
'
).
contentWindow
.
postMessage
(
'
c_mute_status
'
,
'
*
'
);
...
...
This diff is collapsed.
Click to expand it.
bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+
2
−
4
View file @
452a1228
...
...
@@ -238,10 +238,6 @@ class AudioManager {
window
.
parent
.
postMessage
({
response
:
muteState
},
'
*
'
);
}
if
(
fields
.
joined
)
{
window
.
parent
.
postMessage
({
response
:
'
joinedAudio
'
},
'
*
'
);
}
if
(
fields
.
talking
!==
undefined
&&
fields
.
talking
!==
this
.
isTalking
)
{
this
.
isTalking
=
fields
.
talking
;
}
...
...
@@ -254,6 +250,7 @@ class AudioManager {
}
if
(
!
this
.
isEchoTest
)
{
window
.
parent
.
postMessage
({
response
:
'
joinedAudio
'
},
'
*
'
);
this
.
notify
(
this
.
messages
.
info
.
JOINED_AUDIO
);
}
}
...
...
@@ -278,6 +275,7 @@ class AudioManager {
if
(
!
this
.
error
&&
!
this
.
isEchoTest
)
{
this
.
notify
(
this
.
messages
.
info
.
LEFT_AUDIO
);
}
window
.
parent
.
postMessage
({
response
:
'
notInAudio
'
},
'
*
'
);
}
callStateCallback
(
response
)
{
...
...
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