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

Fixes switching to pinned video when hiding a container.

This commit is contained in:
damencho 2016-03-22 16:12:25 -05:00
parent f788a45bac
commit e330dbf5d1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -978,8 +978,19 @@ var VideoLayout = {
var oldSmallVideo = this.getSmallVideo(currentId); var oldSmallVideo = this.getSmallVideo(currentId);
} }
// if !show then use default type - large video let containerTypeToShow = type;
return largeVideo.showContainer(show ? type : VIDEO_CONTAINER_TYPE) // if we are hiding a container and there is focusedVideo
// (pinned remote video) use its video type,
// if not then use default type - large video
if (!show) {
if(focusedVideoResourceJid)
containerTypeToShow = this.getRemoteVideoType(
focusedVideoResourceJid);
else
containerTypeToShow = VIDEO_CONTAINER_TYPE;
}
return largeVideo.showContainer(containerTypeToShow)
.then(() => { .then(() => {
if(oldSmallVideo) if(oldSmallVideo)
oldSmallVideo && oldSmallVideo.updateView(); oldSmallVideo && oldSmallVideo.updateView();