Merge pull request #675 from matrix-org/dbkr/fix_timeline_notifs_empty

richvdh · web-flow · commit 5df5fed6f5f2 · 2017-02-03T11:35:28.000Z
Fix timeline &amp; notifs panel spuriously being empty
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
@@ -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 (
                     <div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
                         <div className="mx_RoomView_empty">{ this.props.empty }</div>

Original file line number	Diff line number	Diff line change
`@@ -993,7 +993,7 @@ var TimelinePanel = React.createClass({`
`993`	`993`	`);`
`994`	`994`	`}`
`995`	`995`
`996`		`- if (this.state.events.length == 0) {`
	`996`	`+ if (this.state.events.length == 0 && !this.state.canBackPaginate && this.props.empty) {`
`997`	`997`	`return (`
`998`	`998`	`<div className={ this.props.className + " mx_RoomView_messageListWrapper" }>`
`999`	`999`	`<div className="mx_RoomView_empty">{ this.props.empty }</div>`