Merge pull request #2222 from vector-im/wmwragg/correct-incoming-call-positioning
Wmwragg/correct incoming call positioning
This commit is contained in:
commit
866164c4d9
|
@ -383,7 +383,7 @@ var RoomSubList = React.createClass({
|
||||||
highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
|
highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
|
||||||
isInvite={ self.props.label === 'Invites' }
|
isInvite={ self.props.label === 'Invites' }
|
||||||
refreshSubList={ self._updateSubListCount }
|
refreshSubList={ self._updateSubListCount }
|
||||||
incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } />
|
incomingCall={ null } />
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -428,13 +428,28 @@ 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 (
|
return (
|
||||||
<div className="mx_RoomSubList_labelContainer" title={ title } ref="header">
|
<div className="mx_RoomSubList_labelContainer" title={ title } ref="header">
|
||||||
<div onClick={ this.onClick } className="mx_RoomSubList_label">
|
<div onClick={ this.onClick } className="mx_RoomSubList_label">
|
||||||
{ this.props.collapsed ? '' : this.props.label }
|
{ this.props.collapsed ? '' : this.props.label }
|
||||||
<div className="mx_RoomSubList_roomCount">{roomCount}</div>
|
<div className="mx_RoomSubList_roomCount">{ roomCount }</div>
|
||||||
<div className={chevronClasses}></div>
|
<div className={chevronClasses}></div>
|
||||||
{badge}
|
{ badge }
|
||||||
|
{ incomingCall }
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue