about summary refs log tree commit diff
path: root/app/javascript/mastodon/components/scrollable_list.js
diff options
context:
space:
mode:
authorLes Orchard <me@lmorchard.com>2018-11-11 17:20:20 -0500
committerEugen Rochko <eugen@zeonfederated.com>2018-11-11 23:20:20 +0100
commitcc1f13dfd0d9fee7d568918af031f1cd6d1441f4 (patch)
treed6413d2eaf552671c363dd7f383b3203aa37ede5 /app/javascript/mastodon/components/scrollable_list.js
parent208d278cbcb0e743c8824dc1587cae4050edf8d7 (diff)
Only consider mouse move in scrolling on item insertion (#9262)
Fixes #9259
Diffstat (limited to 'app/javascript/mastodon/components/scrollable_list.js')
-rw-r--r--app/javascript/mastodon/components/scrollable_list.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
index 7551d0b1f..ab4e7d59c 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -136,7 +136,7 @@ export default class ScrollableList extends PureComponent {
       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.mouseMovedRecently) {
+    if (someItemInserted && (this.node.scrollTop > 0 || this.mouseMovedRecently)) {
       return this.node.scrollHeight - this.node.scrollTop;
     } else {
       return null;