imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-07-29 18:44:59 +00:00
commit 04c8b802b0
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/structures/LoggedInView.js
View file

@ -259,16 +259,16 @@ const LoggedInView = React.createClass({
// When the panels are disabled, clicking on them results in a mouse event // When the panels are disabled, clicking on them results in a mouse event
// which bubbles to certain elements in the tree. When this happens, close // which bubbles to certain elements in the tree. When this happens, close
// any settings page that is currently open (user/room/group). // any settings page that is currently open (user/room/group).
if (this.props.leftDisabled && if (this.props.leftDisabled && this.props.rightDisabled) {
this.props.rightDisabled && const targetClasses = new Set(ev.target.className.split(' '));
( if (
ev.target.className === 'mx_MatrixChat' || targetClasses.has('mx_MatrixChat') ||
ev.target.className === 'mx_MatrixChat_middlePanel' || targetClasses.has('mx_MatrixChat_middlePanel') ||
ev.target.className === 'mx_RoomView' targetClasses.has('mx_RoomView')
)
) { ) {
dis.dispatch({ action: 'close_settings' }); dis.dispatch({ action: 'close_settings' });
} }
}
}, },
render: function() { render: function() {