haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #532 from damencho/resize-ds-onfilm-toggle 

Resizes large video on filmstrip toggle.
This commit is contained in:
yanas 2016-03-16 14:46:32 -05:00
parent 15865c3d42 3577f338cc
commit 6a7919a904
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/UI/UI.js
View File

@ -270,7 +270,10 @@ function registerListeners() {
UI.addListener(UIEvents.TOGGLE_CONTACT_LIST, UI.toggleContactList); 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, false);
});
} }
/** /**

2
modules/UI/side_pannels/SidePanelToggler.js
View File

@ -93,7 +93,7 @@ function toggle (object, selector, onOpenComplete,
function resizeVideoArea(isSidePanelVisible, completeFunction) { function resizeVideoArea(isSidePanelVisible, completeFunction) {
VideoLayout.resizeVideoArea(!isSidePanelVisible, VideoLayout.resizeVideoArea(!isSidePanelVisible,
false, false,
true, false,
completeFunction); completeFunction);
} }

9
modules/UI/videolayout/VideoLayout.js
View File

@ -798,10 +798,11 @@ var VideoLayout = {
* @param forceUpdate indicates that hidden thumbnails will be shown * @param forceUpdate indicates that hidden thumbnails will be shown
* @param completeFunction a function to be called when the video area is * @param completeFunction a function to be called when the video area is
* resized. * resized.
*/resizeVideoArea (isSideBarVisible, */
forceUpdate = false, resizeVideoArea (isSideBarVisible,
animate = false, forceUpdate = false,
completeFunction = null) { animate = false,
completeFunction = null) {
if (largeVideo) { if (largeVideo) {
largeVideo.updateContainerSize(isSideBarVisible); largeVideo.updateContainerSize(isSideBarVisible);