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

Uses fadeTo instead of fadeIn/fadeOut which do not seem to work correctly on Safari.

This commit is contained in:
paweldomas 2016-01-26 11:17:25 -06:00
parent feb0abf701
commit 2fb65dd752
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,7 +308,7 @@ class VideoContainer extends LargeContainer {
let $wrapper = this.$wrapper; let $wrapper = this.$wrapper;
return new Promise(function(resolve) { return new Promise(function(resolve) {
$wrapper.css({visibility: 'visible'}); $wrapper.css({visibility: 'visible'});
$wrapper.fadeIn(FADE_DURATION_MS, function () { $wrapper.fadeTo(FADE_DURATION_MS, 1, function () {
$('.watermark').css({visibility: 'visible'}); $('.watermark').css({visibility: 'visible'});
resolve(); resolve();
}); });
@ -320,7 +320,7 @@ class VideoContainer extends LargeContainer {
let id = this.id; let id = this.id;
return new Promise(function(resolve) { return new Promise(function(resolve) {
$wrapper.fadeOut(id ? FADE_DURATION_MS : 1, function () { $wrapper.fadeTo(id ? FADE_DURATION_MS : 1, 0, function () {
$wrapper.css({visibility: 'hidden'}); $wrapper.css({visibility: 'hidden'});
$('.watermark').css({visibility: 'hidden'}); $('.watermark').css({visibility: 'hidden'});
resolve(); resolve();