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

Fixes updateLarge video to change to different container types which do not have stream.

This commit is contained in:
damencho 2016-03-22 14:49:37 -05:00
parent 2c1a9d20fd
commit 1bdeda4ec3
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/UI/shared_video/SharedVideo.js
View File

@ -124,13 +124,15 @@ export default class SharedVideoManager {
self.isSharedVideoShown = true;
// If we are sending the command and we are starting the player
// we need to continuously send the player current time position
if(APP.conference.isLocalId(self.from)) {
self.intervalId = setInterval(
self.updateCheck.bind(self),
self.updateInterval);
}
// set initial state
// set initial state of the player if there is enough information
if(attributes.state === 'pause')
player.pauseVideo();
else if(attributes.time > 0) {
@ -334,7 +336,7 @@ function SharedVideoThumb (url)
this.videoSpanId = "sharedVideoContainer";
this.container = this.createContainer(this.videoSpanId);
this.container.onclick = this.videoClick.bind(this);
//this.bindHoverHandler();
this.bindHoverHandler();
SmallVideo.call(this, VideoLayout);
this.isVideoMuted = true;
@ -371,7 +373,6 @@ SharedVideoThumb.prototype.createContainer = function (spanId) {
*/
SharedVideoThumb.prototype.videoClick = function () {
VideoLayout.handleVideoThumbClicked(true, this.url);
VideoLayout.showLargeVideoContainer(this.videoType, true);
};
/**

7
modules/UI/videolayout/LargeVideo.js
View File

@ -452,7 +452,12 @@ export default class LargeVideoManager {
// change the avatar url on large
this.updateAvatar(Avatar.getAvatarUrl(id));
let isVideoMuted = stream ? stream.isMuted() : true;
// If we the continer is VIDEO_CONTAINER_TYPE, we need to check
// its stream whether exist and is muted to set isVideoMuted
// in rest of the cases it is false
let isVideoMuted = false;
if (videoType == VIDEO_CONTAINER_TYPE)
isVideoMuted = stream ? stream.isMuted() : true;
// show the avatar on large if needed
container.showAvatar(isVideoMuted);