Skip to content

Commit

Permalink
Merge pull request #243 from chris-allen/fix-travis
Browse files Browse the repository at this point in the history
Fixed travis builds
  • Loading branch information
danbovey committed Mar 30, 2020
2 parents a56033f + 3389bce commit cc570fc
Show file tree
Hide file tree
Showing 5 changed files with 1,202 additions and 105 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
node_js:
- "6"
- "7"
- "8"
- "12"
script:
- npm run lint
- npm run test
Expand Down
4 changes: 4 additions & 0 deletions dist/InfiniteScroll.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ var InfiniteScroll = (function(_Component) {
useCapture: this.props.useCapture,
passive: true
};
} else {
options = {
passive: false
};
}
return options;
}
Expand Down
47 changes: 34 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"url": "git://github.com/CassetteRocks/react-infinite-scroller.git"
},
"scripts": {
"build":
"mkdirp dist && babel src/InfiniteScroll.js --out-file dist/InfiniteScroll.js",
"build": "mkdirp dist && babel src/InfiniteScroll.js --out-file dist/InfiniteScroll.js",
"prepublish": "npm run build",
"test": "nyc npm run spec",
"spec": "_mocha -R spec ./test/test_helper.js --recursive test/*_test.js",
Expand All @@ -23,7 +22,11 @@
"git add"
]
},
"keywords": ["infinite", "scroll", "react"],
"keywords": [
"infinite",
"scroll",
"react"
],
"author": "CassetteRocks",
"license": "MIT",
"bugs": {
Expand Down
Loading

0 comments on commit cc570fc

Please sign in to comment.