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

Fixes a problem not showing remote video menu in case of all moderators. (#2130) 

Removes hasRemoteVideoMenu from RemoteVideo.
In some cases where mod_muc_allowners is enabled we do not see the remote video menu. The problem was in the order of initialization of remote video component.
RemoteVideo#constructor -> Remotevideo#addaddRemoteVideoContainer -> Remotevideo#addRemoteVideoMenu  -> RemoteVideo#hasRemoteVideoMenu = true
Then in VideoLayout#showModeratorIndicator -> !remoteVideo.hasRemoteVideoMenu -> remoteVideo.addRemoteVideoMenu().
This commit is contained in:
Дамян Минков 2017-11-02 14:07:31 -05:00 committed by virtuacoplenny
parent 922bbb1798
commit 90070d9e9f
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/UI/videolayout/RemoteVideo.js
View File

@ -41,7 +41,6 @@ function RemoteVideo(user, VideoLayout, emitter) {
this.videoSpanId = `participant_${this.id}`; this.videoSpanId = `participant_${this.id}`;
SmallVideo.call(this, VideoLayout); SmallVideo.call(this, VideoLayout);
this._audioStreamElement = null; this._audioStreamElement = null;
this.hasRemoteVideoMenu = false;
this._supportsRemoteControl = false; this._supportsRemoteControl = false;
this.statsPopoverLocation = interfaceConfig.VERTICAL_FILMSTRIP this.statsPopoverLocation = interfaceConfig.VERTICAL_FILMSTRIP
? 'left bottom' : 'top center'; ? 'left bottom' : 'top center';
@ -298,9 +297,11 @@ RemoteVideo.prototype._setAudioVolume = function(newVal) {
* *
* @param isMuted the new muted state to update to * @param isMuted the new muted state to update to
*/ */
RemoteVideo.prototype.updateRemoteVideoMenu = function( RemoteVideo.prototype.updateRemoteVideoMenu = function(isMuted) {
isMuted = this.isAudioMuted) {
this.isAudioMuted = isMuted; if (typeof isMuted !== 'undefined') {
this.isAudioMuted = isMuted;
}
this._generatePopupContent(); this._generatePopupContent();
}; };
@ -343,8 +344,6 @@ RemoteVideo.prototype.addRemoteVideoMenu = function() {
} }
this._generatePopupContent(); this._generatePopupContent();
this.hasRemoteVideoMenu = true;
}; };
/** /**
@ -641,7 +640,6 @@ RemoteVideo.prototype.removeRemoteVideoMenu = function() {
if (menuSpan.length) { if (menuSpan.length) {
ReactDOM.unmountComponentAtNode(menuSpan.get(0)); ReactDOM.unmountComponentAtNode(menuSpan.get(0));
menuSpan.remove(); menuSpan.remove();
this.hasRemoteVideoMenu = false;
} }
}; };

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

@ -559,12 +559,7 @@ const VideoLayout = {
remoteVideo.addModeratorIndicator(); remoteVideo.addModeratorIndicator();
} }
if (isModerator) { remoteVideo.updateRemoteVideoMenu();
// We are moderator, but user is not - add menu
if (!remoteVideo.hasRemoteVideoMenu) {
remoteVideo.addRemoteVideoMenu();
}
}
}); });
}, },