Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist

fix historical section
This commit is contained in:
David Baker 2018-06-26 18:26:29 +01:00 committed by GitHub
commit 67dc8f2a8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions

View file

@ -389,10 +389,14 @@ const RoomSubList = React.createClass({
</Droppable> : subListContent;
} else {
const Loader = sdk.getComponent("elements.Spinner");
if (this.props.showSpinner) {
content = <Loader />;
}
return (
<div className="mx_RoomSubList">
{this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined}
{(this.props.showSpinner && !this.state.hidden) ? <Loader /> : undefined}
{ this.state.hidden ? undefined : content }
</div>
);
}