Commit 86e61bf2 authored by Mike's avatar Mike

display videos in-line; remove video element immediately when not needed

parent 4f86c854
......@@ -8826,4 +8826,7 @@ textarea {
.fa {
margin-right: 6px; }
.video-list .video-container {
display: inline-block; }
/*# sourceMappingURL=main.css.map */
\ No newline at end of file
......@@ -69,3 +69,10 @@ textarea {
.fa {
margin-right: 6px;
}
// App styles
// -------------------------
.video-list .video-container {
display: inline-block;
}
......@@ -633,30 +633,15 @@
// Stop watching stats
//monitorStop(stream);
// If not stopping all, leave video container on screen for a bit in case remote stream reconnects
try {
streamDisplay = _.filter(streamDisplay, function(id) { return id != stream.getID(); });
if (!stopped) {
$("#vcont_"+stream.getID()).find(".video-reconnect").show();
if (stream.getID() != localStream.getID()) {
var elemId = stream.elementID;
var guestId = stream.getAttributes().guestId;
if (guestId != undefined) {
reconnectTimers[guestId] = setTimeout(function() {
logger.log("Timed out video:" + elemId);
$("#"+elemId).remove();
resizeVideoList();
}, 30000);
}
}
} else {
// Remove stream from DOM
if (stream.elementID !== undefined) {
var element = document.getElementById(stream.elementID);
var parent = document.getElementById('video-list');
parent.removeChild(element);
resizeVideoList();
}
// Remove stream from DOM
if (stream.elementID !== undefined) {
var element = document.getElementById(stream.elementID);
var parent = document.getElementById('video-list');
parent.removeChild(element);
//resizeVideoList();
}
} catch (error) {
logger.log("Remove video error: " + error);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment