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

Merge branch 'video-resize-issue' of git://github.com/isymchych/jitsi-meet into isymchych-video-resize-issue

This commit is contained in:
hristoterezov 2016-01-25 16:45:36 -06:00
parent 5e3133547d cff44286f5
commit 714e304e98
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,12 +429,12 @@ var VideoLayout = {
* Resizes the large video container. * Resizes the large video container.
*/ */
resizeLargeVideoContainer (isSideBarVisible) { resizeLargeVideoContainer (isSideBarVisible) {
let animate = false;
if (largeVideo) { if (largeVideo) {
largeVideo.updateContainerSize(isSideBarVisible); largeVideo.updateContainerSize(isSideBarVisible);
largeVideo.resize(false); largeVideo.resize(animate);
} else {
this.resizeVideoSpace(false, isSideBarVisible);
} }
this.resizeVideoSpace(animate, isSideBarVisible);
this.resizeThumbnails(false); this.resizeThumbnails(false);
}, },
@ -893,26 +893,22 @@ var VideoLayout = {
* is resized. * is resized.
*/ */
resizeVideoSpace (animate, isChatVisible, completeFunction) { resizeVideoSpace (animate, isChatVisible, completeFunction) {
var availableHeight = window.innerHeight; let availableHeight = window.innerHeight;
var availableWidth = UIUtil.getAvailableVideoWidth(isChatVisible); let availableWidth = UIUtil.getAvailableVideoWidth(isChatVisible);
if (availableWidth < 0 || availableHeight < 0) return; if (availableWidth < 0 || availableHeight < 0) {
return;
if(animate) {
$('#videospace').animate({
right: window.innerWidth - availableWidth,
width: availableWidth,
height: availableHeight
},
{
queue: false,
duration: 500,
complete: completeFunction
});
} else {
$('#videospace').width(availableWidth).height(availableHeight);
} }
$('#videospace').animate({
right: window.innerWidth - availableWidth,
width: availableWidth,
height: availableHeight
}, {
queue: false,
duration: animate ? 500 : 1,
complete: completeFunction
});
}, },
getSmallVideo (id) { getSmallVideo (id) {