matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-28 09:24:05 +03:00
Code Activity

position the inbound call box correctly, and fix various issues with when the video preview and callview are shown

Browse Source
This commit is contained in:
Matthew Hodgson
2015-12-17 02:49:09 +00:00
parent 186b727303
commit d979a028a5
7 changed files with 94 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/RoomView.js
View File

@@ -1207,8 +1207,9 @@ module.exports = React.createClass({
}
var call = CallHandler.getCallForRoom(this.props.roomId);
//var call = CallHandler.getAnyActiveCall();
var inCall = false;
if (call && this.state.callState != 'ended') {
if (call && (this.state.callState !== 'ended' && this.state.callState !== 'ringing')) {
inCall = true;
var zoomButton, voiceMuteButton, videoMuteButton;