Merge pull request #58 from matrix-org/rav/yet_more_scroll_fixes

Fix issue with rooms not scrolling down when new events arrive
This commit is contained in:
Richard van der Hoff 2015-12-17 17:40:41 +00:00
commit 6ee0c72340

View file

@ -318,11 +318,7 @@ module.exports = React.createClass({
if (this.state.searchResults) return; if (this.state.searchResults) return;
if (this.needsScrollReset) {
if (DEBUG_SCROLL) console.log("Resetting scroll position after tile count change");
this._restoreSavedScrollState(); this._restoreSavedScrollState();
this.needsScrollReset = false;
}
// have to fill space in case we're accepting an invite // have to fill space in case we're accepting an invite
if (!this.state.paginating) this.fillSpace(); if (!this.state.paginating) this.fillSpace();
@ -683,10 +679,6 @@ module.exports = React.createClass({
} }
++count; ++count;
} }
if (count != this.lastEventTileCount) {
if (DEBUG_SCROLL) console.log("Queuing scroll reset (event count changed; now "+count+"; was "+this.lastEventTileCount+")");
this.needsScrollReset = true;
}
this.lastEventTileCount = count; this.lastEventTileCount = count;
return ret; return ret;
}, },