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

Merge branch 'jitsi-meet-new' of https://github.com/jitsi/jitmeet into jitsi-meet-new

This commit is contained in:
yanas 2016-01-26 15:28:35 -06:00
parent 5834fbe31a 875a7b6f4f
commit ae4f5c64d4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ function getDesktopVideoSize(videoWidth,
availableHeight = availableWidth / aspectRatio;
}
return { availableWidth, availableHeight };
return [ availableWidth, availableHeight ];
}
@ -106,7 +106,7 @@ function getCameraVideoSize(videoWidth,
}
return { availableWidth, availableHeight };
return [ availableWidth, availableHeight ];
}
/**
@ -179,7 +179,10 @@ class VideoContainer extends LargeContainer {
this.$video.volume = 0;
}
this.$video.on('play', onPlay);
// This does not work with Temasys plugin - has to be a property to be
// copied between new <object> elements
//this.$video.on('play', onPlay);
this.$video[0].onplay = onPlay;
}
/**
@ -239,7 +242,7 @@ class VideoContainer extends LargeContainer {
}
resize (containerWidth, containerHeight, animate = false) {
let { width, height }
let [width, height]
= this.getVideoSize(containerWidth, containerHeight);
let { horizontalIndent, verticalIndent }
= this.getVideoPosition(width, height,
@ -251,8 +254,8 @@ class VideoContainer extends LargeContainer {
this.$avatar.css('top', top);
this.$wrapper.animate({
width,
height,
width: width,
height: height,
top: verticalIndent,
bottom: verticalIndent,