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

Fixes #22.

This commit is contained in:
Yana Stamcheva 2014-01-28 15:11:05 +01:00
parent 2977d67e4f
commit de0faeb6a8
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app.js
View File

@ -302,8 +302,6 @@ $(document).bind('entered.muc', function (event, jid, info, pres) {
updateLockButton(); updateLockButton();
} }
showFocusIndicator();
$(pres).find('>media[xmlns="http://estos.de/ns/mjs"]>source').each(function (idx, ssrc) { $(pres).find('>media[xmlns="http://estos.de/ns/mjs"]>source').each(function (idx, ssrc) {
//console.log(jid, 'assoc ssrc', ssrc.getAttribute('type'), ssrc.getAttribute('ssrc')); //console.log(jid, 'assoc ssrc', ssrc.getAttribute('type'), ssrc.getAttribute('ssrc'));
ssrc2jid[ssrc.getAttribute('ssrc')] = jid; ssrc2jid[ssrc.getAttribute('ssrc')] = jid;
@ -574,8 +572,11 @@ function resizeLarge() {
if (availableWidth < 0 || availableHeight < 0) return; if (availableWidth < 0 || availableHeight < 0) return;
$('#largeVideo').parent().width(availableWidth); $('#largeVideo').parent().width(availableWidth);
$('#largeVideo').parent().height(availableWidth / aspectRatio); $('#largeVideo').parent().height(availableWidth / aspectRatio);
$('#presentation>iframe').width(availableWidth);
$('#presentation>iframe').height(availableWidth / aspectRatio); if ($('#presentation>iframe')) {
$('#presentation>iframe').width(availableWidth);
$('#presentation>iframe').height(availableWidth / aspectRatio);
}
resizeThumbnails(); resizeThumbnails();
} }
@ -586,8 +587,11 @@ function resizeThumbnails() {
// minus the 36px space inside the remoteVideos container used for highlighting shadow. // minus the 36px space inside the remoteVideos container used for highlighting shadow.
var availableHeight = window.innerHeight - $('#largeVideo').height() - 79; var availableHeight = window.innerHeight - $('#largeVideo').height() - 79;
var numvids = $('#remoteVideos>span:visible').length; var numvids = $('#remoteVideos>span:visible').length;
// Remove the 1px borders arround videos.
var availableWinWidth = $('#remoteVideos').width() - 2 * numvids - 50; var chatWidth = $('#chatspace').width();
// Remove the 1px borders arround videos and the chat width.
var availableWinWidth = $('#remoteVideos').width() - 2 * numvids - chatWidth - 50;
var availableWidth = availableWinWidth / numvids; var availableWidth = availableWinWidth / numvids;
var aspectRatio = 16.0 / 9.0; var aspectRatio = 16.0 / 9.0;
var maxHeight = Math.min(160, availableHeight); var maxHeight = Math.min(160, availableHeight);
@ -968,17 +972,16 @@ function updateLockButton() {
function openChat() { function openChat() {
var chatspace = $('#chatspace'); var chatspace = $('#chatspace');
var videospace = $('#videospace'); var videospace = $('#videospace');
var chatspaceWidth = chatspace.width(); var onAnimationProgress = function () {
resizeLarge();
videospace.css({right:chatspace.width()});
};
if (chatspace.css("opacity") == 1) { if (chatspace.css("opacity") == 1) {
chatspace.animate({opacity: 0}, "fast"); chatspace.animate({width: 0, opacity: 0}, {duration: 1000, progress: onAnimationProgress});
chatspace.animate({width: 0}, "slow");
videospace.animate({right: 0, width:"100%"}, "slow");
} }
else { else {
chatspace.animate({width:"20%"}, "slow"); chatspace.animate({width:"20%", opacity: 1}, {duration: 1000, progress: onAnimationProgress});
chatspace.animate({opacity: 1}, "slow");
videospace.animate({right:chatspaceWidth, width:"80%"}, "slow");
} }
// Request the focus in the nickname field or the chat input field. // Request the focus in the nickname field or the chat input field.