about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-09 15:09:50 +0200
committerGitHub <noreply@github.com>2017-09-09 15:09:50 +0200
commitbdc8b4fd91aa90c624bca6cd6fe202876b4f654f (patch)
treeb88181f5a099760811e89103b04a63b7a7001373 /app/javascript
parent2ff7146b6d7ce408badd4ff4bcc323b2fd9b774c (diff)
Disable mouse-based pause from #4859 (#4865)
It wasn't working ideally and introduced some annoying false positivies
Diffstat (limited to 'app/javascript')
-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 aeb0b0f4b..723dd322b 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -74,7 +74,7 @@ export default class ScrollableList extends PureComponent {
 
     // Reset the scroll position when a new child comes in in order not to
     // jerk the scrollbar around if you're already scrolled down the page.
-    if (someItemInserted && this._oldScrollPosition && (this.node.scrollTop > 0 || this._recentlyMoved())) {
+    if (someItemInserted && this._oldScrollPosition && this.node.scrollTop > 0) {
       const newScrollTop = this.node.scrollHeight - this._oldScrollPosition;
 
       if (this.node.scrollTop !== newScrollTop) {