mirror of https://github.com/vector-im/riot-web
we don't do mx_fadable anymore so get rid of broken RLS disabling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>pull/21833/head
parent
15a1772703
commit
fb46258528
|
@ -555,10 +555,6 @@ export default createReactClass({
|
||||||
GROUP_JOINPOLICY_INVITE,
|
GROUP_JOINPOLICY_INVITE,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
dis.dispatch({
|
|
||||||
action: 'panel_disable',
|
|
||||||
sideDisabled: true,
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
|
|
||||||
_onShareClick: function() {
|
_onShareClick: function() {
|
||||||
|
|
|
@ -33,7 +33,6 @@ export default createReactClass({
|
||||||
componentWillMount: function() {
|
componentWillMount: function() {
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
action: 'panel_disable',
|
action: 'panel_disable',
|
||||||
rightDisabled: true,
|
|
||||||
middleDisabled: true,
|
middleDisabled: true,
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -45,7 +44,6 @@ export default createReactClass({
|
||||||
componentWillUnmount: function() {
|
componentWillUnmount: function() {
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
action: 'panel_disable',
|
action: 'panel_disable',
|
||||||
sideDisabled: false,
|
|
||||||
middleDisabled: false,
|
middleDisabled: false,
|
||||||
});
|
});
|
||||||
document.removeEventListener('keydown', this._onKeyDown);
|
document.removeEventListener('keydown', this._onKeyDown);
|
||||||
|
|
|
@ -42,8 +42,6 @@ const GROUP_PHASES = Object.keys(RIGHT_PANEL_PHASES).filter(k => k.startsWith("G
|
||||||
export default class RightPanelStore extends Store {
|
export default class RightPanelStore extends Store {
|
||||||
static _instance;
|
static _instance;
|
||||||
|
|
||||||
_inhibitUpdates = false;
|
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super(dis);
|
super(dis);
|
||||||
|
|
||||||
|
@ -116,11 +114,6 @@ export default class RightPanelStore extends Store {
|
||||||
}
|
}
|
||||||
|
|
||||||
__onDispatch(payload) {
|
__onDispatch(payload) {
|
||||||
if (payload.action === 'panel_disable') {
|
|
||||||
this._inhibitUpdates = payload.rightDisabled || payload.sideDisabled || false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (payload.action === 'view_room' || payload.action === 'view_group') {
|
if (payload.action === 'view_room' || payload.action === 'view_group') {
|
||||||
// Reset to the member list if we're viewing member info
|
// Reset to the member list if we're viewing member info
|
||||||
const memberInfoPhases = [
|
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;
|
const targetPhase = payload.phase;
|
||||||
if (!RIGHT_PANEL_PHASES[targetPhase]) {
|
if (!RIGHT_PANEL_PHASES[targetPhase]) {
|
||||||
|
|
Loading…
Reference in New Issue