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

position the inbound call box correctly, and fix various issues with when the video preview and callview are shown

Browse source
This commit is contained in:
Matthew Hodgson 2015-12-17 02:53:53 +00:00
parent 856156ef5c
commit 1a90a2c426
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,8 @@ var RoomSubList = React.createClass({
bottommost: React.PropTypes.bool,
selectedRoom: React.PropTypes.string.isRequired,
activityMap: React.PropTypes.object.isRequired,
collapsed: React.PropTypes.bool.isRequired
collapsed: React.PropTypes.bool.isRequired,
incomingCall: React.PropTypes.object,
},
getInitialState: function() {
@ -239,7 +240,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 }
/>
);
});
},