back out hacky previous commit as #946 only happens when gemini is disabled

This commit is contained in:
Matthew Hodgson 2016-02-16 19:39:22 +00:00
parent 34d0fc890a
commit 38a2a61b38

View file

@ -418,9 +418,7 @@ module.exports = React.createClass({
var scrollState = this.scrollState; var scrollState = this.scrollState;
var scrollNode = this._getScrollNode(); var scrollNode = this._getScrollNode();
// XXX: DISABLE SCROLL TO TOKEN ENTIRELY TEMPORARILY AS IT'S SCREWING if (scrollState.stuckAtBottom) {
// UP MY DEMO - see https://github.com/vector-im/vector-web/issues/946
if (true || scrollState.stuckAtBottom) {
scrollNode.scrollTop = scrollNode.scrollHeight; scrollNode.scrollTop = scrollNode.scrollHeight;
debuglog("Scrolled to bottom; offset now", scrollNode.scrollTop); debuglog("Scrolled to bottom; offset now", scrollNode.scrollTop);
} else if (scrollState.trackedScrollToken) { } else if (scrollState.trackedScrollToken) {