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

Fixes calls to updateLargeVideo, so that it is called with user resource jid.

This commit is contained in:
paweldomas 2015-06-02 10:05:42 +02:00
parent be64bd883c
commit 1d57cb9dae
3 changed files with 18606 additions and 18607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -19,7 +19,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=79"></script>
<script src="libs/app.bundle.js?v=80"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=7"/>
<link rel="stylesheet" href="css/toastr.css?v=1">

37192
libs/app.bundle.js
View File

File diff suppressed because it is too large Load Diff

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

@ -636,17 +636,15 @@ var VideoLayout = (function (my) {
var myResourceJid = APP.xmpp.myResource();
VideoLayout.updateLargeVideo(localVideoSrc, 0,
myResourceJid);
VideoLayout.updateLargeVideo(localVideoSrc, 0, myResourceJid);
};
my.mucJoined = function () {
var myResourceJid = APP.xmpp.myResource();
if(!largeVideoState.userResourceJid)
VideoLayout.updateLargeVideo(localVideoSrc, 0,
myResourceJid, true);
if (!largeVideoState.userResourceJid)
VideoLayout.updateLargeVideo(localVideoSrc, 0, myResourceJid, true);
};
/**
@ -1882,8 +1880,7 @@ var VideoLayout = (function (my) {
*/
my.onDominantSpeakerChanged = function (resourceJid) {
// We ignore local user events.
if (resourceJid
=== APP.xmpp.myResource())
if (resourceJid === APP.xmpp.myResource())
return;
var members = APP.xmpp.getMembers();
@ -1919,8 +1916,10 @@ var VideoLayout = (function (my) {
// Update the large video if the video source is already available,
// otherwise wait for the "videoactive.jingle" event.
if (video.length && video[0].currentTime > 0)
VideoLayout.updateLargeVideo(APP.RTC.getVideoSrc(video[0]), resourceJid);
if (video.length && video[0].currentTime > 0) {
VideoLayout.updateLargeVideo(
APP.RTC.getVideoSrc(video[0]), 1, resourceJid);
}
}
};
@ -2065,7 +2064,7 @@ var VideoLayout = (function (my) {
continue;
// videoSrcToSsrc needs to be update for this call to succeed.
VideoLayout.updateLargeVideo(src);
VideoLayout.updateLargeVideo(src, 1, resource);
break;
}