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

Merge pull request #57 from matrix-org/matthew/inbound-calls

Browse Source 
Position the inbound call box correctly
This commit is contained in:
Matthew Hodgson
2015-12-18 15:59:18 +00:00
parent 3b87d45e32 5c999fe1ab
commit 831aaec457
7 changed files with 103 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1280,8 +1280,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;