imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added incomingCallBox to header and removed from roomTile

Browse source
This commit is contained in:
wmwragg 2016-09-15 14:39:34 +01:00
parent f95a74951e
commit 45f17eb973
3 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/views/rooms/RoomTile.js
View file

@ -267,11 +267,11 @@ module.exports = React.createClass({
tooltip = <RoomTooltip className="mx_RoomTile_tooltip" room={this.props.room} />;
}
var incomingCallBox;
if (this.props.incomingCall) {
var IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
incomingCallBox = <IncomingCallBox incomingCall={ this.props.incomingCall }/>;
}
//var incomingCallBox;
//if (this.props.incomingCall) {
// var IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
// incomingCallBox = <IncomingCallBox incomingCall={ this.props.incomingCall }/>;
//}
var RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
@ -300,7 +300,7 @@ module.exports = React.createClass({
{ label }
{ badge }
</div>
{ incomingCallBox }
{/* { incomingCallBox } */}
{ tooltip }
</div>
);