mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

fix search ordering; add room labels; hide input areas if searching

Browse source
This commit is contained in:
Matthew Hodgson 2015-11-29 04:41:17 +00:00
parent fc02331cd3
commit 01f0e61d6e
2 changed files with 63 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/skins/vector/views/organisms/RoomView.js
View file

@ -291,6 +291,20 @@ module.exports = React.createClass({
</div>;
}
var statusArea, messageComposer;
if (!this.state.searchResults) {
statusArea =
<div className="mx_RoomView_statusArea">
<div className="mx_RoomView_statusAreaBox">
<div className="mx_RoomView_statusAreaBox_line"></div>
{statusBar}
</div>
</div>
messageComposer =
<MessageComposer room={this.state.room} roomView={this} uploadFile={this.uploadFile} />
}
return (
<div className="mx_RoomView">
<RoomHeader ref="header" room={this.state.room} editing={this.state.editingRoomSettings} onSearchClick={this.onSearchClick}
@ -310,13 +324,8 @@ module.exports = React.createClass({
</ol>
</div>
</GeminiScrollbar>
<div className="mx_RoomView_statusArea">
<div className="mx_RoomView_statusAreaBox">
<div className="mx_RoomView_statusAreaBox_line"></div>
{statusBar}
</div>
</div>
<MessageComposer room={this.state.room} roomView={this} uploadFile={this.uploadFile} />
{ statusArea }
{ messageComposer }
</div>
);
}