zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

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

This commit is contained in:
Henry Smith 2017-04-11 21:58:28 +02:00 committed by Eugen
parent fc47c1d00e
commit 1921c5416b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/components/features/ui/components/column.jsx
View File

@ -41,8 +41,11 @@ const Column = React.createClass({
mixins: [PureRenderMixin], mixins: [PureRenderMixin],
handleHeaderClick () { handleHeaderClick () {
let node = ReactDOM.findDOMNode(this); const scrollable = ReactDOM.findDOMNode(this).querySelector('.scrollable');
this._interruptScrollAnimation = scrollTop(node.querySelector('.scrollable')); if (!scrollable) {
return;
}
this._interruptScrollAnimation = scrollTop(scrollable);
}, },
handleWheel () { handleWheel () {