Merge 6988457 into a7c159f

naver · Jan 10, 2018 · b39db47 · b39db47
2 parents a7c159f + 6988457
commit b39db47
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 23 deletions.
diff --git a/dist/infinitegrid.js b/dist/infinitegrid.js
diff --git a/dist/infinitegrid.js.map b/dist/infinitegrid.js.map
diff --git a/dist/infinitegrid.min.js b/dist/infinitegrid.min.js
diff --git a/dist/infinitegrid.min.js.map b/dist/infinitegrid.min.js.map
diff --git a/dist/infinitegrid.pkgd.js b/dist/infinitegrid.pkgd.js
diff --git a/dist/infinitegrid.pkgd.js.map b/dist/infinitegrid.pkgd.js.map
diff --git a/dist/infinitegrid.pkgd.min.js b/dist/infinitegrid.pkgd.min.js
diff --git a/dist/infinitegrid.pkgd.min.js.map b/dist/infinitegrid.pkgd.min.js.map
diff --git a/dist/parallax.js b/dist/parallax.js
diff --git a/dist/parallax.min.js b/dist/parallax.min.js
diff --git a/src/InfiniteGrid.js b/src/InfiniteGrid.js
@@ -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 ?
@@ -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);
 			},

diff --git a/test/unit/InfiniteGrid.spec.js b/test/unit/InfiniteGrid.spec.js
@@ -9,6 +9,7 @@ import {getItems, insert, checkLayoutComplete} from "./helper/TestHelper";
 import {APPEND, PREPEND, LOADING_APPEND, LOADING_PREPEND} from "../../src/consts";
 import {innerWidth, innerHeight} from "../../src/utils";
 import {DEFENSE_BROWSER} from "../../src/consts";
+import {expectConnectGroupsOutline} from "./helper/common";
 
 /* eslint-disable */
 describe("InfiniteGrid Test", function() {
@@ -402,6 +403,53 @@ describe("InfiniteGrid Test", function() {
       this.inst.append(`<div>HEADER<img src="/base/test/unit/image/3.jpg" />FOOTER</div><div>HEADER<img src="/1.jpg">FOOTER</div>`);
     });
   });
+  describe(`When image processing, fit test`, function() {
+    beforeEach(() => {
+      this.el = sandbox();
+      this.el.innerHTML = "<div id='infinite'></div>";
+      this.inst = new InfiniteGrid("#infinite", {
+        margin: 5,
+        isOverflowScroll: true,
+      });
+      this.inst.setLayout(GridLayout);
+    });
+    afterEach(() => {
+      if (this.inst) {
+        this.inst.destroy();
+        this.inst = null;
+      }
+      cleanup();
+    });
+    it.only(`should check outline when image processing and fit occur at the same time`, done => {
+      const item1 = `<div style="height:100px">HEADER<img src="/base/test/unit/image/3.jpg" />FOOTER</div><div>HEADER<img src="/1.jpg">FOOTER</div>`;
+      const layoutComplete2 = sinon.spy(e => {
+        const length = this.inst._items._data.length;
+
+        const group1 = this.inst._items._data[length - 2];
+        const group2 = this.inst._items._data[length - 1];
+        expectConnectGroupsOutline(group1, group2);
+        done();
+      });
+      insert(this.inst, true, () => {
+        expect(this.inst._isImageProcessing()).to.be.false;
+        const container = this.el.querySelector("#infinite");
+
+        container.scrollTop = 50000;
+
+        const pos = this.inst._watcher.getScrollPos();
+
+        setTimeout(() => {
+          this.inst._recycle(true);
+          this.inst.on("layoutComplete", layoutComplete2);
+          this.inst.append(item1);
+          expect(this.inst._isImageProcessing()).to.be.true;
+          this.inst._fit("before");
+        }, 10);
+
+      }, 10, 20);
+
+    });
+  });
   [true, false].forEach(isOverflowScroll => {
     describe(`When appending/prepending loadingStart/loaingEnd event Test (isOverflowScroll: ${isOverflowScroll})`, function() {
       beforeEach(() => {