click on group call thumbnail should return you to the group call, not the 1:1
parent
b1ba69fd00
commit
46572ae793
|
@ -44,6 +44,7 @@ ConferenceCall.prototype.setup = function() {
|
||||||
// looking for a 1:1 room with this conf user ID!)
|
// looking for a 1:1 room with this conf user ID!)
|
||||||
var call = Matrix.createNewMatrixCall(self.client, room.roomId);
|
var call = Matrix.createNewMatrixCall(self.client, room.roomId);
|
||||||
call.confUserId = self.confUserId;
|
call.confUserId = self.confUserId;
|
||||||
|
call.groupRoomId = self.groupRoomId;
|
||||||
return call;
|
return call;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -79,7 +79,7 @@ var LeftPanel = React.createClass({
|
||||||
if (call) {
|
if (call) {
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
action: 'view_room',
|
action: 'view_room',
|
||||||
room_id: call.roomId,
|
room_id: call.groupRoomId || call.roomId,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue