Merge pull request #276 from blacktea1105/master

resolve flickering cells
TonyGermaneri · Jun 19, 2020 · 7c6a613 · 7c6a613
2 parents 74c6ff6 + 4221a82
commit 7c6a613
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/draw.js b/lib/draw.js
@@ -47,7 +47,7 @@ define([], function () {
         function drawOnAllImagesLoaded() {
             var loaded = true;
             Object.keys(self.htmlImageCache).forEach(function (html) {
-                if (!self.htmlImageCache[html].complete) {
+                if (!self.htmlImageCache[html].img.complete) {
                     loaded = false;
                 }
             });
@@ -63,8 +63,8 @@ define([], function () {
                 x = cell.x + self.canvasOffsetLeft,
                 y = cell.y + self.canvasOffsetTop;
             if (self.htmlImageCache[cacheKey]) {
-                img = self.htmlImageCache[cacheKey];
-                if (img.height !== cell.height || img.width !== cell.width) {
+                img = self.htmlImageCache[cacheKey].img;
+                if (self.htmlImageCache[cacheKey].height !== cell.height || self.htmlImageCache[cacheKey].width !== cell.width) {
                     // height and width of the cell has changed, invalidate cache
                     self.htmlImageCache[cacheKey] = undefined;
                 } else {
@@ -77,7 +77,7 @@ define([], function () {
                 cachedImagesDrawn = false;
             }
             img = new Image(cell.width, cell.height);
-            self.htmlImageCache[cacheKey] = img;
+            self.htmlImageCache[cacheKey] = { img, width: cell.width, height: cell.height };
             img.onload = function () {
                 self.ctx.drawImage(img, x, y);
                 drawOnAllImagesLoaded();