Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog

Allow user to choose from existing DMs on new chat
This commit is contained in:
Luke Barnard 2017-03-07 16:22:52 +00:00 committed by GitHub
commit b7f1b1a424
5 changed files with 159 additions and 29 deletions

View file

@ -553,6 +553,13 @@ module.exports = WithMatrixClient(React.createClass({
Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
},
onRoomTileClick(roomId) {
dis.dispatch({
action: 'view_room',
room_id: roomId,
});
},
_renderDevices: function() {
if (!this._enableDevices) {
return null;
@ -613,6 +620,7 @@ module.exports = WithMatrixClient(React.createClass({
unread={Unread.doesRoomHaveUnreadMessages(room)}
highlight={highlight}
isInvite={me.membership == "invite"}
onClick={this.onRoomTileClick}
/>
);
}