v1.1.2 (#84)

lwojcik · May 15, 2019 · 663bcc9 · 663bcc9
1 parent db7c128
commit 663bcc9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/dist/js/tridi.js b/dist/js/tridi.js
diff --git a/dist/js/tridi.js.map b/dist/js/tridi.js.map
diff --git a/dist/js/tridi.min.js b/dist/js/tridi.min.js
diff --git a/dist/js/tridi.min.js.map b/dist/js/tridi.min.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tridi",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "JavaScript 360 3D Product Viewer",
   "main": "dist/js/tridi.min.js",
   "types": "dist/js/tridi.min.d.ts",

diff --git a/src/tridi.ts b/src/tridi.ts
@@ -1,5 +1,5 @@
 /*
-  Tridi v1.1.1 - JavaScript 360 3D Product Viewer
+  Tridi v1.1.2 - JavaScript 360 3D Product Viewer
   Author: Lukasz Wojcik
   License: MIT
   Homepage: https://tridi.lukem.net
@@ -407,10 +407,10 @@ class Tridi {
     callback: Function
   ) {
     const img = new Image();
-    img.src = imageSrc;
+    img.onload = callback.bind(this);
     img.className += `tridi-image tridi-image-${index + 1}`;
+    img.src = imageSrc;
     stash.innerHTML += img.outerHTML;
-    img.onload = callback.bind(this);
   }
 
   private populateStash() {
@@ -432,15 +432,15 @@ class Tridi {
   private generateViewerImage() {
     const viewer = this.viewer();
     const viewerImage = new Image();
-    viewerImage.src = this.image(1);
+    /* istanbul ignore next */
+    viewerImage.onload = () => this.trigger('onViewerImageGenerate');
     viewerImage.className += `tridi-viewer-image tridi-${
       this.elementName
     }-viewer-image`;
     viewerImage.setAttribute("draggable", "false");
     viewerImage.setAttribute("alt", "");
+    viewerImage.src = this.image(1);
     viewer.innerHTML = `${viewerImage.outerHTML}${viewer.innerHTML}`;
-    /* istanbul ignore next */
-    viewerImage.onload = () => this.trigger('onViewerImageGenerate');
   }
 
   private updateViewerImage(whichImage: number) {