Fixes thumbnails wrap after opening chat window. Closes issue #89.
This commit is contained in:
parent
3a87900bdf
commit
66a64b6b78
25
chat.js
25
chat.js
|
@ -115,8 +115,7 @@ var Chat = (function (my) {
|
|||
+ '</div>');
|
||||
$('#chatconversation').animate(
|
||||
{ scrollTop: $('#chatconversation')[0].scrollHeight}, 1000);
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Sets the subject to the UI
|
||||
|
@ -158,6 +157,10 @@ var Chat = (function (my) {
|
|||
var horizontalIndent = videoPosition[0];
|
||||
var verticalIndent = videoPosition[1];
|
||||
|
||||
var thumbnailSize = VideoLayout.calculateThumbnailSize(videospaceWidth);
|
||||
var thumbnailsWidth = thumbnailSize[0];
|
||||
var thumbnailsHeight = thumbnailSize[1];
|
||||
|
||||
if (chatspace.is(":visible")) {
|
||||
videospace.animate({right: chatSize[0],
|
||||
width: videospaceWidth,
|
||||
|
@ -165,6 +168,15 @@ var Chat = (function (my) {
|
|||
{queue: false,
|
||||
duration: 500});
|
||||
|
||||
$('#remoteVideos').animate({height: thumbnailsHeight},
|
||||
{queue: false,
|
||||
duration: 500});
|
||||
|
||||
$('#remoteVideos>span').animate({height: thumbnailsHeight,
|
||||
width: thumbnailsWidth},
|
||||
{queue: false,
|
||||
duration: 500});
|
||||
|
||||
$('#largeVideoContainer').animate({ width: videospaceWidth,
|
||||
height: videospaceHeight},
|
||||
{queue: false,
|
||||
|
@ -200,6 +212,15 @@ var Chat = (function (my) {
|
|||
}
|
||||
});
|
||||
|
||||
$('#remoteVideos').animate({height: thumbnailsHeight},
|
||||
{queue: false,
|
||||
duration: 500});
|
||||
|
||||
$('#remoteVideos>span').animate({height: thumbnailsHeight,
|
||||
width: thumbnailsWidth},
|
||||
{queue: false,
|
||||
duration: 500});
|
||||
|
||||
$('#largeVideoContainer').animate({ width: videospaceWidth,
|
||||
height: videospaceHeight},
|
||||
{queue: false,
|
||||
|
|
|
@ -570,7 +570,9 @@ var VideoLayout = (function (my) {
|
|||
* Resizes thumbnails.
|
||||
*/
|
||||
my.resizeThumbnails = function() {
|
||||
var thumbnailSize = calculateThumbnailSize();
|
||||
var videoSpaceWidth = $('#remoteVideos').width();
|
||||
|
||||
var thumbnailSize = VideoLayout.calculateThumbnailSize(videoSpaceWidth);
|
||||
var width = thumbnailSize[0];
|
||||
var height = thumbnailSize[1];
|
||||
|
||||
|
@ -682,7 +684,7 @@ var VideoLayout = (function (my) {
|
|||
/**
|
||||
* Calculates the thumbnail size.
|
||||
*/
|
||||
var calculateThumbnailSize = function () {
|
||||
my.calculateThumbnailSize = function (videoSpaceWidth) {
|
||||
// Calculate the available height, which is the inner window height minus
|
||||
// 39px for the header minus 2px for the delimiter lines on the top and
|
||||
// bottom of the large video, minus the 36px space inside the remoteVideos
|
||||
|
@ -691,8 +693,10 @@ var VideoLayout = (function (my) {
|
|||
|
||||
var numvids = $('#remoteVideos>span:visible').length;
|
||||
|
||||
// Remove the 1px borders arround videos and the chat width.
|
||||
var availableWinWidth = $('#remoteVideos').width() - 2 * numvids - 50;
|
||||
// Remove the 3px borders arround videos and border around the remote
|
||||
// videos area
|
||||
var availableWinWidth = videoSpaceWidth - 2 * 3 * numvids - 50;
|
||||
|
||||
var availableWidth = availableWinWidth / numvids;
|
||||
var aspectRatio = 16.0 / 9.0;
|
||||
var maxHeight = Math.min(160, availableHeight);
|
||||
|
|
Loading…
Reference in New Issue