You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-11-05 23:10:41 +03:00
remove hacks, now that emitting show_right_panel is centralized
This commit is contained in:
@@ -565,20 +565,6 @@ export default React.createClass({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
break;
|
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':
|
case 'view_room':
|
||||||
// Takes either a room ID or room alias: if switching to a room the client is already
|
// 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
|
// known to be in (eg. user clicks on a room in the recents panel), supply the ID
|
||||||
|
|||||||
@@ -33,9 +33,6 @@ export default class GroupHeaderButtons extends HeaderButtons {
|
|||||||
super.onAction(payload);
|
super.onAction(payload);
|
||||||
|
|
||||||
if (payload.action === "view_user") {
|
if (payload.action === "view_user") {
|
||||||
dis.dispatch({
|
|
||||||
action: 'show_right_panel',
|
|
||||||
});
|
|
||||||
if (payload.member) {
|
if (payload.member) {
|
||||||
this.setPhase(RightPanel.Phase.RoomMemberInfo, {member: payload.member});
|
this.setPhase(RightPanel.Phase.RoomMemberInfo, {member: payload.member});
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -32,9 +32,6 @@ export default class RoomHeaderButtons extends HeaderButtons {
|
|||||||
onAction(payload) {
|
onAction(payload) {
|
||||||
super.onAction(payload);
|
super.onAction(payload);
|
||||||
if (payload.action === "view_user") {
|
if (payload.action === "view_user") {
|
||||||
dis.dispatch({
|
|
||||||
action: 'show_right_panel',
|
|
||||||
});
|
|
||||||
if (payload.member) {
|
if (payload.member) {
|
||||||
this.setPhase(RightPanel.Phase.RoomMemberInfo, {member: payload.member});
|
this.setPhase(RightPanel.Phase.RoomMemberInfo, {member: payload.member});
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user