mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into kegan/archived-rooms

Browse source
This commit is contained in:
Kegan Dougal 2015-12-18 17:00:20 +00:00
commit dc1e2010a6
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/LeftPanel.js
View file

@ -62,7 +62,7 @@ var LeftPanel = React.createClass({
// audio/video not crap out
var activeCall = CallHandler.getAnyActiveCall();
var callForRoom = CallHandler.getCallForRoom(selectedRoomId);
var showCall = (activeCall && !callForRoom);
var showCall = (activeCall && activeCall.call_state === 'connected' && !callForRoom);
this.setState({
showCallElement: showCall
});
@ -87,7 +87,6 @@ var LeftPanel = React.createClass({
render: function() {
var RoomList = sdk.getComponent('rooms.RoomList');
var BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
var IncomingCallBox = sdk.getComponent('voip.IncomingCallBox');
var collapseButton;
var classes = "mx_LeftPanel";
@ -100,7 +99,7 @@ var LeftPanel = React.createClass({
}
var callPreview;
if (this.state.showCallElement) {
if (this.state.showCallElement && !this.props.collapsed) {
var CallView = sdk.getComponent('voip.CallView');
callPreview = (
<CallView
@ -112,7 +111,6 @@ var LeftPanel = React.createClass({
return (
<aside className={classes}>
{ collapseButton }
<IncomingCallBox />
{ callPreview }
<RoomList
selectedRoom={this.props.selectedRoom}

7
src/components/structures/RoomSubList.js
View file

@ -73,7 +73,8 @@ var RoomSubList = React.createClass({
// so it should be named as such.
collapsed: React.PropTypes.bool.isRequired,
onHeaderClick: React.PropTypes.func,
alwaysShowHeader: React.PropTypes.bool
alwaysShowHeader: React.PropTypes.bool,
incomingCall: React.PropTypes.object
},
getInitialState: function() {
@ -256,7 +257,9 @@ var RoomSubList = React.createClass({
selected={ selected }
unread={ self.props.activityMap[room.roomId] === 1 }
highlight={ self.props.activityMap[room.roomId] === 2 }
isInvite={ self.props.label === 'Invites' } />
isInvite={ self.props.label === 'Invites' }
incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null }
/>
);
});
},