Fixes problem with local speaker removing the active speaker selection. Fixes problem with tooltip appearing behind video.
This commit is contained in:
parent
873cfebe84
commit
f193d0d51d
|
@ -32,6 +32,7 @@
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
border-radius:8px;
|
border-radius:8px;
|
||||||
border: 2px solid #212425;
|
border: 2px solid #212425;
|
||||||
|
margin-right: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#remoteVideos .videocontainer:hover,
|
#remoteVideos .videocontainer:hover,
|
||||||
|
@ -50,7 +51,6 @@
|
||||||
-webkit-animation-iteration-count: 1;
|
-webkit-animation-iteration-count: 1;
|
||||||
-webkit-box-shadow: 0 0 18px #388396;
|
-webkit-box-shadow: 0 0 18px #388396;
|
||||||
border: 2px solid #388396;
|
border: 2px solid #388396;
|
||||||
z-index: 3;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#localVideoWrapper {
|
#localVideoWrapper {
|
||||||
|
|
|
@ -816,6 +816,9 @@ var VideoLayout = (function (my) {
|
||||||
popupmenuElement.appendChild(ejectMenuItem);
|
popupmenuElement.appendChild(ejectMenuItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* On audio muted event.
|
||||||
|
*/
|
||||||
$(document).bind('audiomuted.muc', function (event, jid, isMuted) {
|
$(document).bind('audiomuted.muc', function (event, jid, isMuted) {
|
||||||
var videoSpanId = null;
|
var videoSpanId = null;
|
||||||
if (jid === connection.emuc.myroomjid) {
|
if (jid === connection.emuc.myroomjid) {
|
||||||
|
@ -834,6 +837,9 @@ var VideoLayout = (function (my) {
|
||||||
VideoLayout.showAudioIndicator(videoSpanId, isMuted);
|
VideoLayout.showAudioIndicator(videoSpanId, isMuted);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* On video muted event.
|
||||||
|
*/
|
||||||
$(document).bind('videomuted.muc', function (event, jid, isMuted) {
|
$(document).bind('videomuted.muc', function (event, jid, isMuted) {
|
||||||
var videoSpanId = null;
|
var videoSpanId = null;
|
||||||
if (jid === connection.emuc.myroomjid) {
|
if (jid === connection.emuc.myroomjid) {
|
||||||
|
@ -851,6 +857,10 @@ var VideoLayout = (function (my) {
|
||||||
* On active speaker changed event.
|
* On active speaker changed event.
|
||||||
*/
|
*/
|
||||||
$(document).bind('activespeakerchanged', function (event, resourceJid) {
|
$(document).bind('activespeakerchanged', function (event, resourceJid) {
|
||||||
|
// We ignore local user events.
|
||||||
|
if (resourceJid
|
||||||
|
=== Strophe.getResourceFromJid(connection.emuc.myroomjid))
|
||||||
|
return;
|
||||||
|
|
||||||
// Disable style for previous active speaker.
|
// Disable style for previous active speaker.
|
||||||
if (currentActiveSpeaker
|
if (currentActiveSpeaker
|
||||||
|
@ -888,4 +898,4 @@ var VideoLayout = (function (my) {
|
||||||
});
|
});
|
||||||
|
|
||||||
return my;
|
return my;
|
||||||
}(VideoLayout || {}));
|
}(VideoLayout || {}));
|
||||||
|
|
Loading…
Reference in New Issue