Skip to content

Commit 6af9609

Browse files
committed
Merge branch 'master' into buffer-indexes-on-remove-fix
2 parents d60f696 + a957d07 commit 6af9609

21 files changed

+2113
-1356
lines changed

Diff for: .npmignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.idea
12
/node_modules/
23
/src
34
/temp
@@ -7,6 +8,4 @@
78
.jshintrc
89
.npmignore
910
.travis.yml
10-
bower.json
11-
Gruntfile.js
1211
webpack.config.js

Diff for: README.md

+4
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,10 @@ Pull Rerquest should include source code (./scr) changes, may include tests (./t
477477

478478
## Change log
479479

480+
### v1.8.0
481+
* Reconsidered scroll event handling
482+
* Fixed inertia scrolling issues
483+
480484
### v1.7.6
481485
* Added immutableTop option for applyUpdates and prepend Adapter methods.
482486

Diff for: bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-ui-scroll",
33
"description": "AngularJS infinite scrolling module",
4-
"version": "1.7.6",
4+
"version": "1.8.0",
55
"main": "./dist/ui-scroll.js",
66
"homepage": "https://github.com/angular-ui/ui-scroll.git",
77
"license": "MIT",

Diff for: dist/ui-scroll-grid.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/ui-scroll-grid.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/ui-scroll-grid.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/ui-scroll-grid.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/ui-scroll.js

+55-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/ui-scroll.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/ui-scroll.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/ui-scroll.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)