give Historical an emptyContent to make it look more consistent
and also to unbreak it since now !emptyContent get hidden Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
fabdf22aad
commit
9b50daa748
2 changed files with 15 additions and 2 deletions
|
@ -389,10 +389,16 @@ const RoomSubList = React.createClass({
|
||||||
</Droppable> : subListContent;
|
</Droppable> : subListContent;
|
||||||
} else {
|
} else {
|
||||||
const Loader = sdk.getComponent("elements.Spinner");
|
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 (
|
return (
|
||||||
<div className="mx_RoomSubList">
|
<div className="mx_RoomSubList">
|
||||||
{this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined}
|
{this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined}
|
||||||
{(this.props.showSpinner && !this.state.hidden) ? <Loader /> : undefined}
|
{ content }
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -705,6 +705,13 @@ module.exports = React.createClass({
|
||||||
onShowMoreRooms={self.onShowMoreRooms} />
|
onShowMoreRooms={self.onShowMoreRooms} />
|
||||||
|
|
||||||
<RoomSubList list={self.state.lists['im.vector.fake.archived']}
|
<RoomSubList list={self.state.lists['im.vector.fake.archived']}
|
||||||
|
emptyContent={self.props.collapsed ? null :
|
||||||
|
<div className="mx_RoomList_emptySubListTip_container">
|
||||||
|
<div className="mx_RoomList_emptySubListTip">
|
||||||
|
{ _t('You have no historical rooms') }
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
label={_t('Historical')}
|
label={_t('Historical')}
|
||||||
editable={false}
|
editable={false}
|
||||||
order="recent"
|
order="recent"
|
||||||
|
@ -712,7 +719,7 @@ module.exports = React.createClass({
|
||||||
alwaysShowHeader={true}
|
alwaysShowHeader={true}
|
||||||
startAsHidden={true}
|
startAsHidden={true}
|
||||||
showSpinner={self.state.isLoadingLeftRooms}
|
showSpinner={self.state.isLoadingLeftRooms}
|
||||||
onHeaderClick= {self.onArchivedHeaderClick}
|
onHeaderClick={self.onArchivedHeaderClick}
|
||||||
incomingCall={self.state.incomingCall}
|
incomingCall={self.state.incomingCall}
|
||||||
searchFilter={self.props.searchFilter}
|
searchFilter={self.props.searchFilter}
|
||||||
onShowMoreRooms={self.onShowMoreRooms} />
|
onShowMoreRooms={self.onShowMoreRooms} />
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue