diff options
| -rw-r--r-- | libmproxy/web/static/js/app.js | 6 | ||||
| -rw-r--r-- | web/src/js/utils.js | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js index d7c07089..230ff6e3 100644 --- a/libmproxy/web/static/js/app.js +++ b/libmproxy/web/static/js/app.js @@ -2,7 +2,11 @@ var AutoScrollMixin = { componentWillUpdate: function () { var node = this.getDOMNode(); - this._shouldScrollBottom = node.scrollTop + node.clientHeight === node.scrollHeight; + this._shouldScrollBottom = ( + node.scrollTop !== 0 + && + node.scrollTop + node.clientHeight === node.scrollHeight + ); }, componentDidUpdate: function () { if (this._shouldScrollBottom) { diff --git a/web/src/js/utils.js b/web/src/js/utils.js index b475980a..7541e98d 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -2,7 +2,11 @@ var AutoScrollMixin = { componentWillUpdate: function () { var node = this.getDOMNode(); - this._shouldScrollBottom = node.scrollTop + node.clientHeight === node.scrollHeight; + this._shouldScrollBottom = ( + node.scrollTop !== 0 + && + node.scrollTop + node.clientHeight === node.scrollHeight + ); }, componentDidUpdate: function () { if (this._shouldScrollBottom) { |