logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 1921c5416b08d8374ee7aee6c072eed9b67c58c8
parent: fc47c1d00e507f0bee2575c91822d68b72a22bac
Author: Henry Smith <henry@henrysmith.org>
Date:   Tue, 11 Apr 2017 21:58:28 +0200

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


Diffstat:

Mapp/assets/javascripts/components/features/ui/components/column.jsx7+++++--
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 @@ -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 () {