PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Weblate 2018-01-05 15:26:27 +00:00
commit c0d14904ef
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/RoomStatusBar.js
View file

@ -170,8 +170,10 @@ module.exports = React.createClass({
// Check whether current size is greater than 0, if yes call props.onVisible // Check whether current size is greater than 0, if yes call props.onVisible
_checkSize: function() { _checkSize: function() {
if (this.props.onVisible && this._getSize()) { if (this._getSize()) {
this.props.onVisible(); if (this.props.onVisible) this.props.onVisible();
} else {
if (this.props.onHidden) this.props.onHidden();
} }
}, },

6
src/components/structures/RoomView.js
View file

@ -1348,10 +1348,12 @@ module.exports = React.createClass({
}, },
onStatusBarHidden: function() { onStatusBarHidden: function() {
if (this.unmounted) return; // This is currently not desired as it is annoying if it keeps expanding and collapsing
// TODO: Find a less annoying way of hiding the status bar
/*if (this.unmounted) return;
this.setState({ this.setState({
statusBarVisible: false, statusBarVisible: false,
}); });*/
}, },
showSettings: function(show) { showSettings: function(show) {