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

Merge pull request #3444 from matrix-org/t3chguy/nvl/fix_room_directory 

Reuse showRoom for onJoinClick so we join using alias if its available
pull/21833/head
Bruno Windels 2019-09-16 16:13:28 +00:00 committed by GitHub
parent deddf77a05 7f5d38772d
commit 129d3693b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/RoomDirectory.js
View File

@ -389,13 +389,7 @@ module.exports = createReactClass({
}, },
onJoinClick: function(ev, room) { onJoinClick: function(ev, room) {
this.props.onFinished(); this.showRoom(room, null, true);
MatrixClientPeg.get().joinRoom(room.room_id);
dis.dispatch({
action: 'view_room',
room_id: room.room_id,
joining: true,
});
ev.stopPropagation(); ev.stopPropagation();
}, },