From 2fb65dd752b4c3b5fba04c4d19c0f9a550603b8c Mon Sep 17 00:00:00 2001 From: paweldomas Date: Tue, 26 Jan 2016 11:17:25 -0600 Subject: [PATCH] Uses fadeTo instead of fadeIn/fadeOut which do not seem to work correctly on Safari. --- modules/UI/videolayout/LargeVideo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/UI/videolayout/LargeVideo.js b/modules/UI/videolayout/LargeVideo.js index fe512895e..6903f5c32 100644 --- a/modules/UI/videolayout/LargeVideo.js +++ b/modules/UI/videolayout/LargeVideo.js @@ -308,7 +308,7 @@ class VideoContainer extends LargeContainer { let $wrapper = this.$wrapper; return new Promise(function(resolve) { $wrapper.css({visibility: 'visible'}); - $wrapper.fadeIn(FADE_DURATION_MS, function () { + $wrapper.fadeTo(FADE_DURATION_MS, 1, function () { $('.watermark').css({visibility: 'visible'}); resolve(); }); @@ -320,7 +320,7 @@ class VideoContainer extends LargeContainer { let id = this.id; 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'}); $('.watermark').css({visibility: 'hidden'}); resolve();