浏览代码

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

master
paweldomas 9 年前
父节点
当前提交
2fb65dd752
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2
    2
      modules/UI/videolayout/LargeVideo.js

+ 2
- 2
modules/UI/videolayout/LargeVideo.js 查看文件

308
         let $wrapper = this.$wrapper;
308
         let $wrapper = this.$wrapper;
309
         return new Promise(function(resolve) {
309
         return new Promise(function(resolve) {
310
             $wrapper.css({visibility: 'visible'});
310
             $wrapper.css({visibility: 'visible'});
311
-            $wrapper.fadeIn(FADE_DURATION_MS, function () {
311
+            $wrapper.fadeTo(FADE_DURATION_MS, 1, function () {
312
                 $('.watermark').css({visibility: 'visible'});
312
                 $('.watermark').css({visibility: 'visible'});
313
                 resolve();
313
                 resolve();
314
             });
314
             });
320
 
320
 
321
         let id = this.id;
321
         let id = this.id;
322
         return new Promise(function(resolve) {
322
         return new Promise(function(resolve) {
323
-            $wrapper.fadeOut(id ? FADE_DURATION_MS : 1, function () {
323
+            $wrapper.fadeTo(id ? FADE_DURATION_MS : 1, 0, function () {
324
                 $wrapper.css({visibility: 'hidden'});
324
                 $wrapper.css({visibility: 'hidden'});
325
                 $('.watermark').css({visibility: 'hidden'});
325
                 $('.watermark').css({visibility: 'hidden'});
326
                 resolve();
326
                 resolve();

正在加载...
取消
保存