about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorabcang <abcang1015@gmail.com>2017-09-17 18:59:23 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-09-17 11:59:23 +0200
commit44245926f105e653cfe4fd3397b796df345023b5 (patch)
tree99bf2b87dcda19619563641d520f18105ff560b3 /app/javascript
parent8811778b55023795deaa5d63a7bcfc94f7f50162 (diff)
Fix cancellation of scroll to the right (#4978)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/ui/components/columns_area.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 539af8ce3..5610095b9 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -78,7 +78,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
 
   handleChildrenContentChange() {
     if (!this.props.singleColumn) {
-      scrollRight(this.node, this.node.scrollWidth - window.innerWidth);
+      this._interruptScrollAnimation = scrollRight(this.node, this.node.scrollWidth - window.innerWidth);
     }
   }