matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Expand status *area* unless status *bar* not visible (#655)

Browse Source
This commit is contained in:
Luke Barnard
2017-01-26 18:07:42 +00:00
committed by GitHub
parent 853d94e2d4
commit f462bd8f99
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/RoomView.js
View File

@ -1509,13 +1509,14 @@ module.exports = React.createClass({
}); });
var statusBar; var statusBar;
let isStatusAreaExpanded = true;
if (ContentMessages.getCurrentUploads().length > 0) { if (ContentMessages.getCurrentUploads().length > 0) {
var UploadBar = sdk.getComponent('structures.UploadBar'); var UploadBar = sdk.getComponent('structures.UploadBar');
statusBar = <UploadBar room={this.state.room} />; statusBar = <UploadBar room={this.state.room} />;
} else if (!this.state.searchResults) { } else if (!this.state.searchResults) {
var RoomStatusBar = sdk.getComponent('structures.RoomStatusBar'); var RoomStatusBar = sdk.getComponent('structures.RoomStatusBar');
isStatusAreaExpanded = this.state.statusBarVisible;
statusBar = <RoomStatusBar statusBar = <RoomStatusBar
room={this.state.room} room={this.state.room}
tabComplete={this.tabComplete} tabComplete={this.tabComplete}
@ -1685,7 +1686,7 @@ module.exports = React.createClass({
); );
} }
let statusBarAreaClass = "mx_RoomView_statusArea mx_fadable"; let statusBarAreaClass = "mx_RoomView_statusArea mx_fadable";
if (this.state.statusBarVisible) { if (isStatusAreaExpanded) {
statusBarAreaClass += " mx_RoomView_statusArea_expanded"; statusBarAreaClass += " mx_RoomView_statusArea_expanded";
} }