mirror of
https://github.com/element-hq/element-web
synced 2024-11-27 11:47:23 +03:00
Merge pull request #675 from matrix-org/dbkr/fix_timeline_notifs_empty
Fix timeline & notifs panel spuriously being empty
This commit is contained in:
commit
5df5fed6f5
1 changed files with 1 additions and 1 deletions
|
@ -993,7 +993,7 @@ var TimelinePanel = React.createClass({
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.state.events.length == 0) {
|
if (this.state.events.length == 0 && !this.state.canBackPaginate && this.props.empty) {
|
||||||
return (
|
return (
|
||||||
<div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
|
<div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
|
||||||
<div className="mx_RoomView_empty">{ this.props.empty }</div>
|
<div className="mx_RoomView_empty">{ this.props.empty }</div>
|
||||||
|
|
Loading…
Reference in a new issue