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

Merge pull request #932 from jitsi/fix_jibri 

fix(FilmStrip): Add check for thumbnails
This commit is contained in:
Emil Ivov 2016-09-23 16:46:49 -05:00 committed by GitHub
parent d319e837f5 42d9d0393d
commit a35e194a2d
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/UI/videolayout/FilmStrip.js
View File

@ -216,24 +216,24 @@ const FilmStrip = {
return new Promise(resolve => {
let thumbs = this.getThumbs(!forceUpdate);
thumbs.localThumb.animate({
height: local.thumbHeight,
width: local.thumbWidth
}, {
queue: false,
duration: animate ? 500 : 0,
complete: resolve
});
thumbs.remoteThumbs.animate({
height: remote.thumbHeight,
width: remote.thumbWidth
}, {
queue: false,
duration: animate ? 500 : 0,
complete: resolve
});
if(thumbs.localThumb)
thumbs.localThumb.animate({
height: local.thumbHeight,
width: local.thumbWidth
}, {
queue: false,
duration: animate ? 500 : 0,
complete: resolve
});
if(thumbs.remoteThumbs)
thumbs.remoteThumbs.animate({
height: remote.thumbHeight,
width: remote.thumbWidth
}, {
queue: false,
duration: animate ? 500 : 0,
complete: resolve
});
this.filmStrip.animate({
// adds 2 px because of small video 1px border
@ -270,4 +270,4 @@ const FilmStrip = {
};
export default FilmStrip;
export default FilmStrip;