OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #181 from matrix-org/rav/issue_1049 

Fix CallView in left panel
pull/21833/head
Richard van der Hoff 2016-02-29 17:51:39 +00:00
parent 559f60d43e 30abf81ed4
commit dc9a7e5e28
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/views/voip/CallView.js
View File

@ -23,8 +23,9 @@ module.exports = React.createClass({
displayName: 'CallView', displayName: 'CallView',
propTypes: { propTypes: {
// js-sdk room object // js-sdk room object. If set, we will only show calls for the given
room: React.PropTypes.object.isRequired, // room; if not, we will show any active call.
room: React.PropTypes.object,
// A Conference Handler implementation // A Conference Handler implementation
// Must have a function signature: // Must have a function signature:
@ -44,7 +45,7 @@ module.exports = React.createClass({
componentDidMount: function() { componentDidMount: function() {
this.dispatcherRef = dis.register(this.onAction); this.dispatcherRef = dis.register(this.onAction);
this.showCall(this.props.room.roomId); this.showCall();
}, },
componentWillUnmount: function() { componentWillUnmount: function() {
@ -54,20 +55,27 @@ module.exports = React.createClass({
onAction: function(payload) { onAction: function(payload) {
// don't filter out payloads for room IDs other than props.room because // don't filter out payloads for room IDs other than props.room because
// we may be interested in the conf 1:1 room // we may be interested in the conf 1:1 room
if (payload.action !== 'call_state' || !payload.room_id) { if (payload.action !== 'call_state') {
return; return;
} }
this.showCall(payload.room_id); this.showCall();
}, },
showCall: function(roomId) { showCall: function() {
var call = ( var call;
CallHandler.getCallForRoom(roomId) ||
if (this.props.room) {
var roomId = this.props.room.roomId;
call = CallHandler.getCallForRoom(roomId) ||
(this.props.ConferenceHandler ? (this.props.ConferenceHandler ?
this.props.ConferenceHandler.getConferenceCallForRoom(roomId) : this.props.ConferenceHandler.getConferenceCallForRoom(roomId) :
null null
)
); );
}
else {
call = CallHandler.getAnyActiveCall();
}
if (call) { if (call) {
call.setLocalVideoElement(this.getVideoView().getLocalVideoElement()); call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());
call.setRemoteVideoElement(this.getVideoView().getRemoteVideoElement()); call.setRemoteVideoElement(this.getVideoView().getRemoteVideoElement());