From: Henry Smith <henry@henrysmith.org>
Date: Tue, 11 Apr 2017 19:58:28 +0000 (+0200)
Subject: Fix console error when scrolling a column with no scrollable content (#1574)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1921c5416b08d8374ee7aee6c072eed9b67c58c8;p=mastodon.git

Fix console error when scrolling a column with no scrollable content (#1574)
---

diff --git a/app/assets/javascripts/components/features/ui/components/column.jsx b/app/assets/javascripts/components/features/ui/components/column.jsx
index 2b7e11bf1..057b1a9af 100644
--- a/app/assets/javascripts/components/features/ui/components/column.jsx
+++ b/app/assets/javascripts/components/features/ui/components/column.jsx
@@ -41,8 +41,11 @@ const Column = React.createClass({
   mixins: [PureRenderMixin],
 
   handleHeaderClick () {
-    let node = ReactDOM.findDOMNode(this);
-    this._interruptScrollAnimation = scrollTop(node.querySelector('.scrollable'));
+    const scrollable = ReactDOM.findDOMNode(this).querySelector('.scrollable');
+    if (!scrollable) {
+      return;
+    }
+    this._interruptScrollAnimation = scrollTop(scrollable);
   },
 
   handleWheel () {