Browse Source

Fix the usages of Detect Passive Events (#4749)

master
Akihiko Odaki 7 years ago
committed by Eugen Rochko
parent
commit
69957ed10a
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      app/javascript/mastodon/components/column.js
  2. +2
    -2
      app/javascript/mastodon/features/ui/components/columns_area.js

+ 1
- 1
app/javascript/mastodon/components/column.js View File

@ -32,7 +32,7 @@ export default class Column extends React.PureComponent {
}
componentDidMount () {
this.node.addEventListener('wheel', this.handleWheel, detectPassiveEvents ? { passive: true } : false);
this.node.addEventListener('wheel', this.handleWheel, detectPassiveEvents.hasSupport ? { passive: true } : false);
}
componentWillUnmount () {

+ 2
- 2
app/javascript/mastodon/features/ui/components/columns_area.js View File

@ -49,7 +49,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
componentDidMount() {
if (!this.props.singleColumn) {
this.node.addEventListener('wheel', this.handleWheel, detectPassiveEvents ? { passive: true } : false);
this.node.addEventListener('wheel', this.handleWheel, detectPassiveEvents.hasSupport ? { passive: true } : false);
}
this.lastIndex = getIndex(this.context.router.history.location.pathname);
this.setState({ shouldAnimate: true });
@ -63,7 +63,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
componentDidUpdate(prevProps) {
if (this.props.singleColumn !== prevProps.singleColumn && !this.props.singleColumn) {
this.node.addEventListener('wheel', this.handleWheel, detectPassiveEvents ? { passive: true } : false);
this.node.addEventListener('wheel', this.handleWheel, detectPassiveEvents.hasSupport ? { passive: true } : false);
}
this.lastIndex = getIndex(this.context.router.history.location.pathname);
this.setState({ shouldAnimate: true });

Loading…
Cancel
Save