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

Merge pull request #503 from isymchych/fix-logo-blink 

Fix watermark logo blinking during video switching
This commit is contained in:
Paweł Domas 2016-02-17 09:27:41 -06:00
parent 61b28fccf2 255f374894
commit 8b2244b47a
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/UI/videolayout/LargeVideo.js
View File

@ -300,14 +300,6 @@ class VideoContainer extends LargeContainer {
this.$avatar.css("visibility", show ? "visible" : "hidden"); this.$avatar.css("visibility", show ? "visible" : "hidden");
} }
/**
* Show or hide watermark.
* @param {boolean} show
*/
showWatermark (show) {
$('.watermark').css('visibility', show ? 'visible' : 'hidden');
}
// We are doing fadeOut/fadeIn animations on parent div which wraps // We are doing fadeOut/fadeIn animations on parent div which wraps
// largeVideo, because when Temasys plugin is in use it replaces // largeVideo, because when Temasys plugin is in use it replaces
// <video> elements with plugin <object> tag. In Safari jQuery is // <video> elements with plugin <object> tag. In Safari jQuery is
@ -326,7 +318,6 @@ class VideoContainer extends LargeContainer {
FADE_DURATION_MS, FADE_DURATION_MS,
1, 1,
() => { () => {
this.showWatermark(true);
this.isVisible = true; this.isVisible = true;
resolve(); resolve();
} }
@ -343,7 +334,6 @@ class VideoContainer extends LargeContainer {
return new Promise((resolve) => { return new Promise((resolve) => {
this.$wrapper.fadeTo(FADE_DURATION_MS, 0, () => { this.$wrapper.fadeTo(FADE_DURATION_MS, 0, () => {
this.$wrapper.css('visibility', 'hidden'); this.$wrapper.css('visibility', 'hidden');
this.showWatermark(false);
this.isVisible = false; this.isVisible = false;
resolve(); resolve();
}); });
@ -450,7 +440,7 @@ export default class LargeVideoManager {
// do not show stream if video is muted // do not show stream if video is muted
// but we still should show watermark // but we still should show watermark
if (isVideoMuted) { if (isVideoMuted) {
this.videoContainer.showWatermark(true); this.showWatermark(true);
promise = Promise.resolve(); promise = Promise.resolve();
} else { } else {
promise = this.videoContainer.show(); promise = this.videoContainer.show();
@ -543,6 +533,14 @@ export default class LargeVideoManager {
$("#dominantSpeakerAvatar").attr('src', avatarUrl); $("#dominantSpeakerAvatar").attr('src', avatarUrl);
} }
/**
* Show or hide watermark.
* @param {boolean} show
*/
showWatermark (show) {
$('.watermark').css('visibility', show ? 'visible' : 'hidden');
}
/** /**
* Add container of specified type. * Add container of specified type.
* @param {string} type container type * @param {string} type container type
@ -596,11 +594,18 @@ export default class LargeVideoManager {
} }
let oldContainer = this.containers[this.state]; let oldContainer = this.containers[this.state];
if (this.state === VideoContainerType) {
this.showWatermark(false);
}
oldContainer.hide(); oldContainer.hide();
this.state = type; this.state = type;
let container = this.getContainer(type); let container = this.getContainer(type);
return container.show(); return container.show().then(() => {
if (type === VideoContainerType) {
this.showWatermark(true);
}
});
} }
} }