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

Fixes showing display name and hiding avtar, when video is muted and avtar is on large.

This commit is contained in:
damencho 2016-01-14 13:30:56 -06:00
parent a6a6d2992e
commit cd4ebca730
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/UI/videolayout/SmallVideo.js
View File

@ -328,6 +328,8 @@ SmallVideo.prototype.hasVideo = function () {
/** /**
* Hides or shows the user's avatar. * Hides or shows the user's avatar.
* This update assumes that large video had been updated and we will
* reflect it on this small video.
* *
* @param show whether we should show the avatar or not * @param show whether we should show the avatar or not
* video because there is no dominant speaker and no focused speaker * video because there is no dominant speaker and no focused speaker
@ -347,12 +349,13 @@ SmallVideo.prototype.updateView = function () {
let avatar = $(`#avatar_${this.id}`); let avatar = $(`#avatar_${this.id}`);
var showVideo = !this.isVideoMuted var isCurrentlyOnLarge = this.VideoLayout.isCurrentlyOnLarge(this.id);
&& !this.VideoLayout.isCurrentlyOnLarge(this.id);
var showVideo = !this.isVideoMuted && !isCurrentlyOnLarge;
var showAvatar; var showAvatar;
if ((!this.isLocal && if ((!this.isLocal
!this.VideoLayout.isInLastN(this.id)) || && !this.VideoLayout.isInLastN(this.id))
this.isVideoMuted) { || this.isVideoMuted) {
showAvatar = true; showAvatar = true;
} else { } else {
// We want to show the avatar when the video is muted or not exists // We want to show the avatar when the video is muted or not exists
@ -360,6 +363,8 @@ SmallVideo.prototype.updateView = function () {
showAvatar = !this.stream || this.stream.isMuted(); showAvatar = !this.stream || this.stream.isMuted();
} }
showAvatar = showAvatar && !isCurrentlyOnLarge;
if (video && video.length > 0) { if (video && video.length > 0) {
setVisibility(video, showVideo); setVisibility(video, showVideo);
} }