瀏覽代碼

ref(filmstirp): remove animate flag from resizeThumbnails

The flag is always false.
master
Leonard Kim 7 年之前
父節點
當前提交
2ce3c2d459

+ 1
- 1
modules/UI/shared_video/SharedVideo.js 查看文件

286
 
286
 
287
             thumb.setDisplayName('YouTube');
287
             thumb.setDisplayName('YouTube');
288
             VideoLayout.addRemoteVideoContainer(self.url, thumb);
288
             VideoLayout.addRemoteVideoContainer(self.url, thumb);
289
-            VideoLayout.resizeThumbnails(false, true);
289
+            VideoLayout.resizeThumbnails(true);
290
 
290
 
291
             const iframe = player.getIframe();
291
             const iframe = player.getIframe();
292
 
292
 

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

438
      * Resizes thumbnails
438
      * Resizes thumbnails
439
      * @param local
439
      * @param local
440
      * @param remote
440
      * @param remote
441
-     * @param animate
442
      * @param forceUpdate
441
      * @param forceUpdate
443
      * @returns {Promise}
442
      * @returns {Promise}
444
      */
443
      */
445
-    // eslint-disable-next-line max-params, no-unused-vars
446
-    resizeThumbnails(local, remote, animate = false, forceUpdate = false) {
444
+    // eslint-disable-next-line max-params
445
+    resizeThumbnails(local, remote, forceUpdate = false) {
447
         const thumbs = this.getThumbs(!forceUpdate);
446
         const thumbs = this.getThumbs(!forceUpdate);
448
 
447
 
449
         if (thumbs.localThumb) {
448
         if (thumbs.localThumb) {

+ 1
- 1
modules/UI/videolayout/RemoteVideo.js 查看文件

95
 
95
 
96
     this.updateRemoteVideoMenu();
96
     this.updateRemoteVideoMenu();
97
 
97
 
98
-    this.VideoLayout.resizeThumbnails(false, true);
98
+    this.VideoLayout.resizeThumbnails(true);
99
 
99
 
100
     this.addAudioLevelIndicator();
100
     this.addAudioLevelIndicator();
101
 
101
 

+ 5
- 7
modules/UI/videolayout/VideoLayout.js 查看文件

74
 
74
 
75
         // if we do not resize the thumbs here, if there is no video device
75
         // if we do not resize the thumbs here, if there is no video device
76
         // the local video thumb maybe one pixel
76
         // the local video thumb maybe one pixel
77
-        this.resizeThumbnails(false, true);
77
+        this.resizeThumbnails(true);
78
 
78
 
79
         this.handleVideoThumbClicked = this.handleVideoThumbClicked.bind(this);
79
         this.handleVideoThumbClicked = this.handleVideoThumbClicked.bind(this);
80
 
80
 
468
             remoteVideo.setVideoType(VIDEO_CONTAINER_TYPE);
468
             remoteVideo.setVideoType(VIDEO_CONTAINER_TYPE);
469
         }
469
         }
470
 
470
 
471
-        VideoLayout.resizeThumbnails(false, true);
471
+        VideoLayout.resizeThumbnails(true);
472
 
472
 
473
         // Initialize the view
473
         // Initialize the view
474
         remoteVideo.updateView();
474
         remoteVideo.updateView();
480
         logger.info(`${resourceJid} video is now active`, videoElement);
480
         logger.info(`${resourceJid} video is now active`, videoElement);
481
 
481
 
482
         VideoLayout.resizeThumbnails(
482
         VideoLayout.resizeThumbnails(
483
-            false, false, () => {
483
+            false, () => {
484
                 if (videoElement) {
484
                 if (videoElement) {
485
                     $(videoElement).show();
485
                     $(videoElement).show();
486
                 }
486
                 }
575
      * Resizes thumbnails.
575
      * Resizes thumbnails.
576
      */
576
      */
577
     resizeThumbnails(
577
     resizeThumbnails(
578
-            animate = false,
579
             forceUpdate = false,
578
             forceUpdate = false,
580
             onComplete = null) {
579
             onComplete = null) {
581
         const { localVideo, remoteVideo }
580
         const { localVideo, remoteVideo }
582
             = Filmstrip.calculateThumbnailSize();
581
             = Filmstrip.calculateThumbnailSize();
583
 
582
 
584
-        Filmstrip.resizeThumbnails(localVideo, remoteVideo,
585
-            animate, forceUpdate);
583
+        Filmstrip.resizeThumbnails(localVideo, remoteVideo, forceUpdate);
586
 
584
 
587
         if (onComplete && typeof onComplete === 'function') {
585
         if (onComplete && typeof onComplete === 'function') {
588
             onComplete();
586
             onComplete();
878
         }
876
         }
879
 
877
 
880
         // Resize the thumbnails first.
878
         // Resize the thumbnails first.
881
-        this.resizeThumbnails(false, forceUpdate);
879
+        this.resizeThumbnails(forceUpdate);
882
 
880
 
883
         // Resize the video area element.
881
         // Resize the video area element.
884
         $('#videospace').animate({
882
         $('#videospace').animate({

Loading…
取消
儲存