Skip to content

Commit

Permalink
Merge a269126 into a7c159f
Browse files Browse the repository at this point in the history
  • Loading branch information
daybrush committed Jan 10, 2018
2 parents a7c159f + a269126 commit 43418c1
Show file tree
Hide file tree
Showing 14 changed files with 54 additions and 10,096 deletions.
4,494 changes: 0 additions & 4,494 deletions dist/infinitegrid.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/infinitegrid.js.map

This file was deleted.

11 changes: 0 additions & 11 deletions dist/infinitegrid.min.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/infinitegrid.min.js.map

This file was deleted.

4,873 changes: 0 additions & 4,873 deletions dist/infinitegrid.pkgd.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/infinitegrid.pkgd.js.map

This file was deleted.

15 changes: 0 additions & 15 deletions dist/infinitegrid.pkgd.min.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/infinitegrid.pkgd.min.js.map

This file was deleted.

683 changes: 0 additions & 683 deletions dist/parallax.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/parallax.js.map

This file was deleted.

11 changes: 0 additions & 11 deletions dist/parallax.min.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/parallax.min.js.map

This file was deleted.

9 changes: 6 additions & 3 deletions src/InfiniteGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -777,15 +777,16 @@ ig.on("imageError", e => {
});
}
_postLayout(fromCache, items, isAppend, isTrusted) {
const {startCursor, endCursor} = this._status;
const outline = this._items.getOutline(
isAppend ? this._status.endCursor : this._status.startCursor,
isAppend ? endCursor : startCursor,
isAppend ? "end" : "start");

let fromRelayout = false;

if (fromCache) {
const cacheOutline = this._items.getOutline(
isAppend ? this._status.endCursor + 1 : this._status.startCursor - 1,
isAppend ? endCursor + 1 : startCursor - 1,
isAppend ? "start" : "end");

fromRelayout = outline.length === cacheOutline.length ?
Expand Down Expand Up @@ -818,7 +819,9 @@ ig.on("imageError", e => {
complete: () => {
layouted = this._layout[method](
this._renderer.updateSize(items),
outline
this._items.getOutline(
isAppend ? endCursor : startCursor,
isAppend ? "end" : "start")
);
this._postImageLoaded(fromCache, layouted, isAppend, isTrusted);
},
Expand Down
Loading

0 comments on commit 43418c1

Please sign in to comment.