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

Merge pull request #3443 from matrix-org/dbkr/fixroomdir-itemclick-bis_2 

Fix: stop propagation click handler for <TR> doesn't run
pull/21833/head
David Baker 2019-09-13 14:08:35 +01:00 committed by GitHub
parent 3fb72cd1b7 6d13ea0043
commit 3986d78d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,25 +369,27 @@ module.exports = React.createClass({
} }
}, },
onPreviewClick: function(room) { onPreviewClick: function(ev, room) {
this.props.onFinished(); this.props.onFinished();
dis.dispatch({ dis.dispatch({
action: 'view_room', action: 'view_room',
room_id: room.room_id, room_id: room.room_id,
should_peek: true, should_peek: true,
}); });
ev.stopPropagation();
}, },
onViewClick: function(room) { onViewClick: function(ev, room) {
this.props.onFinished(); this.props.onFinished();
dis.dispatch({ dis.dispatch({
action: 'view_room', action: 'view_room',
room_id: room.room_id, room_id: room.room_id,
should_peek: false, should_peek: false,
}); });
ev.stopPropagation();
}, },
onJoinClick: function(room) { onJoinClick: function(ev, room) {
this.props.onFinished(); this.props.onFinished();
MatrixClientPeg.get().joinRoom(room.room_id); MatrixClientPeg.get().joinRoom(room.room_id);
dis.dispatch({ dis.dispatch({
@ -395,6 +397,7 @@ module.exports = React.createClass({
room_id: room.room_id, room_id: room.room_id,
joining: true, joining: true,
}); });
ev.stopPropagation();
}, },
onCreateRoomClick: function(room) { onCreateRoomClick: function(room) {
@ -458,16 +461,16 @@ module.exports = React.createClass({
if (room.world_readable && !hasJoinedRoom) { if (room.world_readable && !hasJoinedRoom) {
previewButton = ( previewButton = (
<AccessibleButton kind="secondary" onClick={() => this.onPreviewClick(room)}>{_t("Preview")}</AccessibleButton> <AccessibleButton kind="secondary" onClick={(ev) => this.onPreviewClick(ev, room)}>{_t("Preview")}</AccessibleButton>
); );
} }
if (hasJoinedRoom) { if (hasJoinedRoom) {
joinOrViewButton = ( joinOrViewButton = (
<AccessibleButton kind="secondary" onClick={() => this.onViewClick(room)}>{_t("View")}</AccessibleButton> <AccessibleButton kind="secondary" onClick={(ev) => this.onViewClick(ev, room)}>{_t("View")}</AccessibleButton>
); );
} else if (!isGuest || room.guest_can_join) { } else if (!isGuest || room.guest_can_join) {
joinOrViewButton = ( joinOrViewButton = (
<AccessibleButton kind="primary" onClick={() => this.onJoinClick(room)}>{_t("Join")}</AccessibleButton> <AccessibleButton kind="primary" onClick={(ev) => this.onJoinClick(ev, room)}>{_t("Join")}</AccessibleButton>
); );
} }