OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/21833/head
Weblate 2018-07-29 18:44:59 +00:00
parent c77aa7d27e 2bc4dcc7da
commit 04c8b802b0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/structures/LoggedInView.js
View File

@ -259,15 +259,15 @@ 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' }); }
} }
}, },