matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

give Historical an emptyContent to make it look more consistent

Browse Source 
and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2018-06-26 07:46:33 +01:00
parent fabdf22aad
commit 9b50daa748
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/RoomSubList.js
View File

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