]> cat aescling's git repositories - mastodon.git/commitdiff
Fix console error when scrolling a column with no scrollable content (#1574)
authorHenry Smith <henry@henrysmith.org>
Tue, 11 Apr 2017 19:58:28 +0000 (21:58 +0200)
committerEugen <eugen@zeonfederated.com>
Tue, 11 Apr 2017 19:58:28 +0000 (21:58 +0200)
app/assets/javascripts/components/features/ui/components/column.jsx

index 2b7e11bf1bc25a55baa72bc0d6a28e2022ec5283..057b1a9af205ee0b3007002eefe263ae0f49d6cb 100644 (file)
@@ -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 () {