From fb462585280a1f4dff9b0a3b64154b068e52791c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Mar 2020 13:57:36 +0000 Subject: [PATCH] we don't do mx_fadable anymore so get rid of broken RLS disabling Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/GroupView.js | 4 ---- src/components/views/rooms/ForwardMessage.js | 2 -- src/stores/RightPanelStore.js | 9 +-------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index cadc511fc3..0d10dd6d8f 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -555,10 +555,6 @@ export default createReactClass({ GROUP_JOINPOLICY_INVITE, }, }); - dis.dispatch({ - action: 'panel_disable', - sideDisabled: true, - }); }, _onShareClick: function() { diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js index c7c954dc9f..78466f7cb5 100644 --- a/src/components/views/rooms/ForwardMessage.js +++ b/src/components/views/rooms/ForwardMessage.js @@ -33,7 +33,6 @@ export default createReactClass({ componentWillMount: function() { dis.dispatch({ action: 'panel_disable', - rightDisabled: true, middleDisabled: true, }); }, @@ -45,7 +44,6 @@ export default createReactClass({ componentWillUnmount: function() { dis.dispatch({ action: 'panel_disable', - sideDisabled: false, middleDisabled: false, }); document.removeEventListener('keydown', this._onKeyDown); diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js index 1b3cb3d64b..ccdeb006f4 100644 --- a/src/stores/RightPanelStore.js +++ b/src/stores/RightPanelStore.js @@ -42,8 +42,6 @@ const GROUP_PHASES = Object.keys(RIGHT_PANEL_PHASES).filter(k => k.startsWith("G export default class RightPanelStore extends Store { static _instance; - _inhibitUpdates = false; - constructor() { super(dis); @@ -116,11 +114,6 @@ export default class RightPanelStore extends Store { } __onDispatch(payload) { - if (payload.action === 'panel_disable') { - this._inhibitUpdates = payload.rightDisabled || payload.sideDisabled || false; - return; - } - if (payload.action === 'view_room' || payload.action === 'view_group') { // Reset to the member list if we're viewing member info const memberInfoPhases = [ @@ -138,7 +131,7 @@ export default class RightPanelStore extends Store { } } - if (payload.action !== 'set_right_panel_phase' || this._inhibitUpdates) return; + if (payload.action !== 'set_right_panel_phase') return; const targetPhase = payload.phase; if (!RIGHT_PANEL_PHASES[targetPhase]) {