magento/adobe-stock-integration#1387: Uncaught TypeError: Cannot read…

… property 'complete' of undefined appears in dev console if save Previewed image as a new View and open this View on another page - fix static test and unit test
joweecaquicla · Aug 20, 2020 · d24d07d · d24d07d
1 parent e2e6b3e
commit d24d07d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -50,15 +50,18 @@ define([
             $(document).on('keydown', this.handleKeyDown.bind(this));
 
             this.lastOpenedImage.subscribe(function (newValue) {
+
                 if (newValue === false && _.isNull(this.visibleRecord())) {
                     return;
                 }
+
                 if (newValue === this.visibleRecord()) {
                     return;
                 }
 
                 if (newValue === false) {
                     this.hide();
+
                     return;
                 }
 
@@ -170,16 +173,14 @@ define([
                 setTimeout(function () {
                     this.updateImageData();
                 }.bind(this), 100);
+            } else if (img.get(0).complete) {
+                this.updateHeight();
+                this.scrollToPreview();
             } else {
-                if (img.get(0).complete) {
+                img.load(function () {
                     this.updateHeight();
                     this.scrollToPreview();
-                } else {
-                    img.load(function () {
-                        this.updateHeight();
-                        this.scrollToPreview();
-                    }.bind(this));
-                }
+                }.bind(this));
             }
         },
 

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js
@@ -74,6 +74,7 @@ define([
                     originMock = $.fn.get;
 
                 spyOn($.fn, 'get').and.returnValue(imageMock);
+                imagePreview.lastOpenedImage = jasmine.createSpy().and.returnValue(2);
                 imagePreview.visibleRecord = jasmine.createSpy().and.returnValue(2);
                 imagePreview.displayedRecord = ko.observable();
                 imagePreview.displayedRecord(recordMock);