about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-06 21:50:26 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-06 21:50:26 +0200
commit4133f70902c0c88f511ef8f09b665b2ea4b8dc3a (patch)
tree04017347d3a1c0e4f49041cdbb0f565501c2c387
parent331190e5fb71ab6e0647e46adcd85ce31ddae092 (diff)
Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)"
This reverts commit 32974a58dcf5a8db39a9c0378f923a40d787cad3.
-rw-r--r--app/javascript/flavours/glitch/components/scrollable_list.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/scrollable_list.js b/app/javascript/flavours/glitch/components/scrollable_list.js
index b8281b1ee..56e91f864 100644
--- a/app/javascript/flavours/glitch/components/scrollable_list.js
+++ b/app/javascript/flavours/glitch/components/scrollable_list.js
@@ -86,7 +86,7 @@ export default class ScrollableList extends PureComponent {
     const someItemInserted = React.Children.count(prevProps.children) > 0 &&
       React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
       this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
-    if (someItemInserted && this.node.scrollTop > 0 || (this.state.mouseOver && !prevProps.isLoading)) {
+    if (someItemInserted && this.node.scrollTop > 0 || this.state.mouseOver) {
       return this.node.scrollHeight - this.node.scrollTop;
     } else {
       return null;