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

Fixes remove video element functionality in UI to remove only the correct video instead of all.

This commit is contained in:
hristoterezov 2015-04-09 14:02:33 +03:00
parent b6155c04ad
commit e01713f6f8
3 changed files with 18482 additions and 18472 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/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=54"></script> <script src="libs/app.bundle.js?v=55"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=6"/> <link rel="stylesheet" href="css/font.css?v=6"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

36946
libs/app.bundle.js
View File

File diff suppressed because it is too large Load Diff

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

@ -1179,7 +1179,7 @@ var VideoLayout = (function (my) {
console.log('stream ended', this); console.log('stream ended', this);
VideoLayout.removeRemoteStreamElement( VideoLayout.removeRemoteStreamElement(
stream, isVideo, container); stream, isVideo, container, newElementId);
// NOTE(gp) it seems that under certain circumstances, the // NOTE(gp) it seems that under certain circumstances, the
// onended event is not fired and thus the contact list is not // onended event is not fired and thus the contact list is not
@ -1249,14 +1249,14 @@ var VideoLayout = (function (my) {
* @param isVideo <tt>true</tt> if given <tt>stream</tt> is a video one. * @param isVideo <tt>true</tt> if given <tt>stream</tt> is a video one.
* @param container * @param container
*/ */
my.removeRemoteStreamElement = function (stream, isVideo, container) { my.removeRemoteStreamElement = function (stream, isVideo, container, id) {
if (!container) if (!container)
return; return;
var select = null; var select = null;
var removedVideoSrc = null; var removedVideoSrc = null;
if (isVideo) { if (isVideo) {
select = $('#' + container.id + '>video'); select = $('#' + id);
removedVideoSrc = APP.RTC.getVideoSrc(select.get(0)); removedVideoSrc = APP.RTC.getVideoSrc(select.get(0));
} }
else else