Merge pull request #4238 from matrix-org/t3chguy/fix_rls

we don't do mx_fadable anymore so get rid of broken RightPanel disabling
pull/21833/head
Michael Telatynski 2020-03-19 14:26:03 +00:00 committed by GitHub
commit 58bfc49e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 14 deletions

View File

@ -555,10 +555,6 @@ export default createReactClass({
GROUP_JOINPOLICY_INVITE,
},
});
dis.dispatch({
action: 'panel_disable',
sideDisabled: true,
});
},
_onShareClick: function() {

View File

@ -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);

View File

@ -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]) {