From 97733cd17ae6ef1c2a0c499c51d0cf032d48d607 Mon Sep 17 00:00:00 2001 From: damencho Date: Fri, 11 Mar 2016 12:57:49 -0600 Subject: [PATCH 1/2] Resizes large video on filmstrip toggle. --- modules/UI/UI.js | 5 ++++- modules/UI/videolayout/VideoLayout.js | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/UI/UI.js b/modules/UI/UI.js index e68113ff2..60c453200 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -276,7 +276,10 @@ function registerListeners() { UI.addListener(UIEvents.TOGGLE_CONTACT_LIST, UI.toggleContactList); - UI.addListener(UIEvents.TOGGLE_FILM_STRIP, UI.toggleFilmStrip); + UI.addListener(UIEvents.TOGGLE_FILM_STRIP, function () { + UI.toggleFilmStrip(); + VideoLayout.resizeVideoArea(PanelToggler.isVisible(), true, true); + }); } /** diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js index 730a55dc3..a671c67b6 100644 --- a/modules/UI/videolayout/VideoLayout.js +++ b/modules/UI/videolayout/VideoLayout.js @@ -804,10 +804,11 @@ var VideoLayout = { * @param forceUpdate indicates that hidden thumbnails will be shown * @param completeFunction a function to be called when the video area is * resized. - */resizeVideoArea (isSideBarVisible, - forceUpdate = false, - animate = false, - completeFunction = null) { + */ + resizeVideoArea (isSideBarVisible, + forceUpdate = false, + animate = false, + completeFunction = null) { if (largeVideo) { largeVideo.updateContainerSize(isSideBarVisible); From 3577f338ccbd748f3d96de0a8cfbb8e0f94265c0 Mon Sep 17 00:00:00 2001 From: damencho Date: Wed, 16 Mar 2016 14:35:30 -0500 Subject: [PATCH 2/2] Does not do force-update when resizing. --- modules/UI/UI.js | 2 +- modules/UI/side_pannels/SidePanelToggler.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/UI/UI.js b/modules/UI/UI.js index 60c453200..880e017b4 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -278,7 +278,7 @@ function registerListeners() { UI.addListener(UIEvents.TOGGLE_FILM_STRIP, function () { UI.toggleFilmStrip(); - VideoLayout.resizeVideoArea(PanelToggler.isVisible(), true, true); + VideoLayout.resizeVideoArea(PanelToggler.isVisible(), true, false); }); } diff --git a/modules/UI/side_pannels/SidePanelToggler.js b/modules/UI/side_pannels/SidePanelToggler.js index 9336d65b1..8d4d6f47b 100644 --- a/modules/UI/side_pannels/SidePanelToggler.js +++ b/modules/UI/side_pannels/SidePanelToggler.js @@ -93,7 +93,7 @@ function toggle (object, selector, onOpenComplete, function resizeVideoArea(isSidePanelVisible, completeFunction) { VideoLayout.resizeVideoArea(!isSidePanelVisible, false, - true, + false, completeFunction); }