From 1921c5416b08d8374ee7aee6c072eed9b67c58c8 Mon Sep 17 00:00:00 2001 From: Henry Smith Date: Tue, 11 Apr 2017 21:58:28 +0200 Subject: [PATCH] Fix console error when scrolling a column with no scrollable content (#1574) --- .../components/features/ui/components/column.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 () {