mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-11-04 10:11:03 +01:00
Code Issues Projects Releases Wiki Activity

Added incomingCallBox to header and removed from roomTile

Browse Source
This commit is contained in:
wmwragg 2016-09-15 14:37:53 +01:00
parent 2a85b2271c
commit cde3f33db3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/structures/RoomSubList.js
View File

@ -383,7 +383,7 @@ var RoomSubList = React.createClass({
highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
isInvite={ self.props.label === 'Invites' }
refreshSubList={ self._updateSubListCount }
incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } />
incomingCall={ null } />
);
});
},
@ -428,6 +428,20 @@ var RoomSubList = React.createClass({
}
}
var incomingCall;
if (this.props.incomingCall) {
var self = this;
// Check if the incoming call is for this section
var incomingCallRoom = this.state.sortedList.filter(function(room) {
return self.props.incomingCall.roomId === room.roomId;
});
if (incomingCallRoom.length === 1) {
var IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
incomingCall = <IncomingCallBox className="mx_RoomSubList_incomingCall" incomingCall={ this.props.incomingCall }/>;
}
}
return (
<div className="mx_RoomSubList_labelContainer" title={ title } ref="header">
<div onClick={ this.onClick } className="mx_RoomSubList_label">
@ -436,6 +450,7 @@ var RoomSubList = React.createClass({
<div className={chevronClasses}></div>
{badge}
</div>
{ incomingCall }
</div>
);
},