haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes the issue with ether pad and the broken thumbnail selection.

This commit is contained in:
hristoterezov 2014-10-17 14:16:37 +03:00
parent 83dc70eae5
commit d5a2281a01
1 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
videolayout.js
View File

@ -175,54 +175,53 @@ var VideoLayout = (function (my) {
? getDesktopVideoPosition ? getDesktopVideoPosition
: getCameraVideoPosition; : getCameraVideoPosition;
if (largeVideoState.isVisible) {
// Only if the large video is currently visible. // Only if the large video is currently visible.
// Disable previous dominant speaker video. // Disable previous dominant speaker video.
if (largeVideoState.oldJid) { if (largeVideoState.oldJid) {
var oldResourceJid = Strophe.getResourceFromJid(largeVideoState.oldJid); var oldResourceJid = Strophe.getResourceFromJid(largeVideoState.oldJid);
VideoLayout.enableDominantSpeaker(oldResourceJid, false); VideoLayout.enableDominantSpeaker(oldResourceJid, false);
if(VideoLayout.connectionIndicators) { if(VideoLayout.connectionIndicators) {
var videoContainerId = null; var videoContainerId = null;
if (oldResourceJid == Strophe.getResourceFromJid(connection.emuc.myroomjid)) { if (oldResourceJid == Strophe.getResourceFromJid(connection.emuc.myroomjid)) {
videoContainerId = 'localVideoContainer'; videoContainerId = 'localVideoContainer';
}
else {
videoContainerId = 'participant_' + oldResourceJid;
}
if(VideoLayout.connectionIndicators[videoContainerId])
VideoLayout.connectionIndicators[videoContainerId].setShowHQ(false);
} }
else {
} videoContainerId = 'participant_' + oldResourceJid;
// Enable new dominant speaker in the remote videos section.
if (largeVideoState.userJid) {
var resourceJid = Strophe.getResourceFromJid(largeVideoState.userJid);
VideoLayout.enableDominantSpeaker(resourceJid, true);
if(VideoLayout.connectionIndicators)
{
var videoContainerId = null;
if (resourceJid
=== Strophe.getResourceFromJid(connection.emuc.myroomjid)) {
videoContainerId = 'localVideoContainer';
}
else {
videoContainerId = 'participant_' + resourceJid;
}
if(VideoLayout.connectionIndicators[videoContainerId])
VideoLayout.connectionIndicators[videoContainerId].setShowHQ(true);
} }
if(VideoLayout.connectionIndicators[videoContainerId])
VideoLayout.connectionIndicators[videoContainerId].setShowHQ(false);
} }
largeVideoState.updateInProgress = false;
if (fade) {
// using "this" should be ok because we're called
// from within the fadeOut event.
$(this).fadeIn(300);
}
} }
// Enable new dominant speaker in the remote videos section.
if (largeVideoState.userJid) {
var resourceJid = Strophe.getResourceFromJid(largeVideoState.userJid);
VideoLayout.enableDominantSpeaker(resourceJid, true);
if(VideoLayout.connectionIndicators)
{
var videoContainerId = null;
if (resourceJid
=== Strophe.getResourceFromJid(connection.emuc.myroomjid)) {
videoContainerId = 'localVideoContainer';
}
else {
videoContainerId = 'participant_' + resourceJid;
}
if(VideoLayout.connectionIndicators[videoContainerId])
VideoLayout.connectionIndicators[videoContainerId].setShowHQ(true);
}
}
if (fade && largeVideoState.isVisible) {
// using "this" should be ok because we're called
// from within the fadeOut event.
$(this).fadeIn(300);
}
largeVideoState.updateInProgress = false;
}; };
if (fade) { if (fade) {