Просмотр исходного кода

ref(filmstirp): remove animate flag from resizeThumbnails

The flag is always false.
master
Leonard Kim 7 лет назад
Родитель
Сommit
2ce3c2d459

+ 1
- 1
modules/UI/shared_video/SharedVideo.js Просмотреть файл

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

+ 2
- 3
modules/UI/videolayout/Filmstrip.js Просмотреть файл

@@ -438,12 +438,11 @@ const Filmstrip = {
438 438
      * Resizes thumbnails
439 439
      * @param local
440 440
      * @param remote
441
-     * @param animate
442 441
      * @param forceUpdate
443 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 446
         const thumbs = this.getThumbs(!forceUpdate);
448 447
 
449 448
         if (thumbs.localThumb) {

+ 1
- 1
modules/UI/videolayout/RemoteVideo.js Просмотреть файл

@@ -95,7 +95,7 @@ RemoteVideo.prototype.addRemoteVideoContainer = function() {
95 95
 
96 96
     this.updateRemoteVideoMenu();
97 97
 
98
-    this.VideoLayout.resizeThumbnails(false, true);
98
+    this.VideoLayout.resizeThumbnails(true);
99 99
 
100 100
     this.addAudioLevelIndicator();
101 101
 

+ 5
- 7
modules/UI/videolayout/VideoLayout.js Просмотреть файл

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

Загрузка…
Отмена
Сохранить