Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Reuse showRoom for onJoinClick so we join using alias if its available #3444

Merged
merged 2 commits into from
Sep 16, 2019
Merged

Reuse showRoom for onJoinClick so we join using alias if its available #3444

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54d98c2
Reuse showRoom for onJoinClick so we join using alias if its available
t3chguy Sep 15, 2019
7f5d387
don't fire onFinished twice
t3chguy Sep 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/components/structures/RoomDirectory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,7 @@ module.exports = createReactClass({
},

onJoinClick: function(ev, room) {
this.props.onFinished();
MatrixClientPeg.get().joinRoom(room.room_id);
dis.dispatch({
action: 'view_room',
room_id: room.room_id,
joining: true,
});
this.showRoom(room, null, true);
ev.stopPropagation();
},

Expand Down