gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

click on group call thumbnail should return you to the group call, not the 1:1

This commit is contained in:
Matthew Hodgson 2016-04-12 02:27:35 +01:00
parent b1ba69fd00
commit 46572ae793
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/VectorConferenceHandler.js
View File

@ -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;
}); });
}; };

2
src/components/structures/LeftPanel.js
View File

@ -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,
}); });
} }
}, },