position the inbound call box correctly, and fix various issues with when the video preview and callview are shown
This commit is contained in:
parent
186b727303
commit
d979a028a5
7 changed files with 94 additions and 78 deletions
|
@ -529,6 +529,7 @@ module.exports = React.createClass({
|
|||
|
||||
onHangupClick: function() {
|
||||
var call = CallHandler.getCallForRoom(this.props.room.roomId);
|
||||
//var call = CallHandler.getAnyActiveCall();
|
||||
if (!call) {
|
||||
return;
|
||||
}
|
||||
|
@ -563,6 +564,7 @@ module.exports = React.createClass({
|
|||
|
||||
var callButton, videoCallButton, hangupButton;
|
||||
var call = CallHandler.getCallForRoom(this.props.room.roomId);
|
||||
//var call = CallHandler.getAnyActiveCall();
|
||||
if (this.props.callState && this.props.callState !== 'ended') {
|
||||
hangupButton =
|
||||
<div className="mx_MessageComposer_hangup" onClick={this.onHangupClick}>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue