From 6ca1a879c966709bf272a7f47865d8ac6f18261c Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 10 Apr 2019 13:22:31 +0200 Subject: [PATCH] remove hacks, now that emitting show_right_panel is centralized --- src/components/structures/MatrixChat.js | 14 -------------- .../views/right_panel/GroupHeaderButtons.js | 3 --- .../views/right_panel/RoomHeaderButtons.js | 3 --- 3 files changed, 20 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 387f2ca69d..fe0deb0d49 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -565,20 +565,6 @@ export default React.createClass({ }, }); break; - case 'view_user': - // FIXME: ugly hack to expand the RightPanel and then re-dispatch. - if (this.state.collapsedRhs) { - setTimeout(()=>{ - dis.dispatch({ - action: 'show_right_panel', - }); - dis.dispatch({ - action: 'view_user', - member: payload.member, - }); - }, 0); - } - break; case 'view_room': // Takes either a room ID or room alias: if switching to a room the client is already // known to be in (eg. user clicks on a room in the recents panel), supply the ID diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js index 494ccb88fa..9bc69de1ab 100644 --- a/src/components/views/right_panel/GroupHeaderButtons.js +++ b/src/components/views/right_panel/GroupHeaderButtons.js @@ -33,9 +33,6 @@ export default class GroupHeaderButtons extends HeaderButtons { super.onAction(payload); if (payload.action === "view_user") { - dis.dispatch({ - action: 'show_right_panel', - }); if (payload.member) { this.setPhase(RightPanel.Phase.RoomMemberInfo, {member: payload.member}); } else { diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js index aff5274cec..cbdc2cd81b 100644 --- a/src/components/views/right_panel/RoomHeaderButtons.js +++ b/src/components/views/right_panel/RoomHeaderButtons.js @@ -32,9 +32,6 @@ export default class RoomHeaderButtons extends HeaderButtons { onAction(payload) { super.onAction(payload); if (payload.action === "view_user") { - dis.dispatch({ - action: 'show_right_panel', - }); if (payload.member) { this.setPhase(RightPanel.Phase.RoomMemberInfo, {member: payload.member}); } else {