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

Fixes issue with video thumbnail not being removed for users without camera and mic.

This commit is contained in:
paweldomas 2015-07-29 18:41:22 +02:00
parent baee96734c
commit f2bd76ac93
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/UI/videolayout/RemoteVideo.js
View File

@ -147,24 +147,21 @@ RemoteVideo.prototype.removeRemoteStreamElement = function (stream, isVideo, id)
select.removed = true; select.removed = true;
select.remove(); select.remove();
var audioCount = $('#' + this.videoSpanId + '>audio').length;
var videoCount = $('#' + this.videoSpanId + '>' + APP.RTC.getVideoElementName()).length;
if (!audioCount && !videoCount) {
console.log("Remove whole user", this.videoSpanId);
if(this.connectionIndicator)
this.connectionIndicator.remove();
// Remove whole container
if (this.container.parentNode)
this.container.parentNode.removeChild(this.container);
this.VideoLayout.resizeThumbnails();
}
if (isVideo) if (isVideo)
this.VideoLayout.updateRemovedVideo(this.getResourceJid()); this.VideoLayout.updateRemovedVideo(this.getResourceJid());
}; };
/**
* Removes RemoteVideo from the page.
*/
RemoteVideo.prototype.remove = function () {
console.log("Remove thumbnail", this.peerJid);
this.removeConnectionIndicator();
// Remove whole container
if (this.container.parentNode)
this.container.parentNode.removeChild(this.container);
};
RemoteVideo.prototype.waitForPlayback = function (sel, stream) { RemoteVideo.prototype.waitForPlayback = function (sel, stream) {
var isVideo = stream.getVideoTracks().length > 0; var isVideo = stream.getVideoTracks().length > 0;
@ -300,14 +297,14 @@ RemoteVideo.prototype.showPeerContainer = function (state) {
}; };
RemoteVideo.prototype.removeConnectionIndicator = function () { RemoteVideo.prototype.removeConnectionIndicator = function () {
if(this.connectionIndicator) if (this.connectionIndicator)
this.connectionIndicator.remove(); this.connectionIndicator.remove();
} };
RemoteVideo.prototype.hideConnectionIndicator = function () { RemoteVideo.prototype.hideConnectionIndicator = function () {
if(this.connectionIndicator) if (this.connectionIndicator)
this.connectionIndicator.hide(); this.connectionIndicator.hide();
} };
/** /**
* Updates the remote video menu. * Updates the remote video menu.

3
modules/UI/videolayout/VideoLayout.js
View File

@ -821,8 +821,9 @@ var VideoLayout = (function (my) {
var remoteVideo = remoteVideos[resourceJid]; var remoteVideo = remoteVideos[resourceJid];
if (remoteVideo) { if (remoteVideo) {
remoteVideo.removeConnectionIndicator();
// Remove remote video // Remove remote video
console.info("Removing remote video: " + resourceJid);
remoteVideo.remove();
delete remoteVideos[resourceJid]; delete remoteVideos[resourceJid];
} else { } else {
console.warn("No remote video for " + resourceJid); console.warn("No remote video for " + resourceJid);