diff options
author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2021-01-10 11:17:55 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-10 11:17:55 +0900 |
commit | 98a2603dc163210d3a0aab0a0c2b8ef74c7e5eb0 (patch) | |
tree | 761694d2d697c58faf02a3ff9ef26bf045fc0274 /app/javascript/mastodon/components/column.js | |
parent | 7cd4ed7d4298626d2b141cd6d8378e95bc248824 (diff) | |
parent | 087ed84367537ac168ed3e00bb7eb4bd582dc3d0 (diff) | |
download | mastodon-feature-limited-visibility-bearcaps.tar mastodon-feature-limited-visibility-bearcaps.tar.gz mastodon-feature-limited-visibility-bearcaps.tar.bz2 mastodon-feature-limited-visibility-bearcaps.zip |
Merge branch 'master' into feature-limited-visibility-bearcapsfeature-limited-visibility-bearcaps
Diffstat (limited to 'app/javascript/mastodon/components/column.js')
-rw-r--r-- | app/javascript/mastodon/components/column.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/components/column.js b/app/javascript/mastodon/components/column.js index 55e3bfd5e..239824a4f 100644 --- a/app/javascript/mastodon/components/column.js +++ b/app/javascript/mastodon/components/column.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import detectPassiveEvents from 'detect-passive-events'; +import { supportsPassiveEvents } from 'detect-passive-events'; import { scrollTop } from '../scroll'; export default class Column extends React.PureComponent { @@ -35,9 +35,9 @@ export default class Column extends React.PureComponent { componentDidMount () { if (this.props.bindToDocument) { - document.addEventListener('wheel', this.handleWheel, detectPassiveEvents.hasSupport ? { passive: true } : false); + document.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false); } else { - this.node.addEventListener('wheel', this.handleWheel, detectPassiveEvents.hasSupport ? { passive: true } : false); + this.node.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false); } } |