Browse Source

Fixes missing local video thumbnail before entering a conference.

j8
yanas 9 years ago
parent
commit
6e7ed13370
3 changed files with 9 additions and 7 deletions
  1. 1
    1
      modules/UI/UI.js
  2. 3
    2
      modules/UI/toolbars/BottomToolbar.js
  3. 5
    4
      modules/UI/videolayout/VideoLayout.js

+ 1
- 1
modules/UI/UI.js View File

@@ -338,7 +338,7 @@ UI.start = function () {
338 338
     if (!interfaceConfig.filmStripOnly) {
339 339
         VideoLayout.initLargeVideo(PanelToggler.isVisible());
340 340
     }
341
-    VideoLayout.resizeLargeVideoContainer(PanelToggler.isVisible());
341
+    VideoLayout.resizeLargeVideoContainer(PanelToggler.isVisible(), true);
342 342
 
343 343
     ContactList.init(eventEmitter);
344 344
 

+ 3
- 2
modules/UI/toolbars/BottomToolbar.js View File

@@ -65,7 +65,8 @@ const BottomToolbar = {
65 65
         return this.filmStrip.width();
66 66
     },
67 67
 
68
-    resizeThumbnails (thumbWidth, thumbHeight, animate = false, show = false) {
68
+    resizeThumbnails (thumbWidth, thumbHeight,
69
+                      animate = false, forceUpdate = false) {
69 70
         return new Promise(resolve => {
70 71
             this.filmStrip.animate({
71 72
                 // adds 2 px because of small video 1px border
@@ -75,7 +76,7 @@ const BottomToolbar = {
75 76
                 duration: animate ? 500 : 0
76 77
             });
77 78
 
78
-            this.getThumbs(!show).animate({
79
+            this.getThumbs(!forceUpdate).animate({
79 80
                 height: thumbHeight,
80 81
                 width: thumbWidth
81 82
             }, {

+ 5
- 4
modules/UI/videolayout/VideoLayout.js View File

@@ -429,25 +429,26 @@ var VideoLayout = {
429 429
     /**
430 430
      * Resizes the large video container.
431 431
      */
432
-    resizeLargeVideoContainer (isSideBarVisible) {
432
+    resizeLargeVideoContainer (isSideBarVisible, forceUpdate) {
433 433
         let animate = false;
434 434
         if (largeVideo) {
435 435
             largeVideo.updateContainerSize(isSideBarVisible);
436 436
             largeVideo.resize(animate);
437 437
         }
438 438
         this.resizeVideoSpace(animate, isSideBarVisible);
439
-        this.resizeThumbnails(false);
439
+        this.resizeThumbnails(false, forceUpdate);
440 440
     },
441 441
 
442 442
     /**
443 443
      * Resizes thumbnails.
444 444
      */
445
-    resizeThumbnails (animate = false, show = false) {
445
+    resizeThumbnails (animate = false, forceUpdate = false) {
446 446
         let {thumbWidth, thumbHeight} = this.calculateThumbnailSize();
447 447
 
448 448
         $('.userAvatar').css('left', (thumbWidth - thumbHeight) / 2);
449 449
 
450
-        BottomToolbar.resizeThumbnails(thumbWidth, thumbHeight, animate, show)
450
+        BottomToolbar.resizeThumbnails(thumbWidth, thumbHeight,
451
+            animate, forceUpdate)
451 452
             .then(function () {
452 453
                 BottomToolbar.resizeToolbar(thumbWidth, thumbHeight);
453 454
                 AudioLevels.updateCanvasSize(thumbWidth, thumbHeight);

Loading…
Cancel
Save