From 34e0361eebac1845903631ba1ee252a4d3e152f4 Mon Sep 17 00:00:00 2001
From: Niklas Fondberg <niklas.fondberg@photowall.se>
Date: Mon, 10 Feb 2020 13:23:52 +0100
Subject: [PATCH] Remove double load of 3d image and stop caching

---
 dist/image-editor.js | 22 ++++++++--------------
 src/Canvas.js        | 22 ++++++++--------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/dist/image-editor.js b/dist/image-editor.js
index 0bc914c..2881c03 100644
--- a/dist/image-editor.js
+++ b/dist/image-editor.js
@@ -451,6 +451,7 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
       'crop[h]=' + imageData.height,
       'crop[x]=' + imageData.x,
       'crop[y]=' + imageData.y,
+      'no-cache=1',
     ];
 
     if (imageData.mirrored) {
@@ -582,21 +583,14 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
 
     $document.trigger('PIE:image-start-load');
 
-    $.ajax({
-      url: this.get3dUrl(),
-      crossDomain: true,
-      type: 'HEAD',
-      cache: true,
-    }).done(function() {
-      fabric.Image.fromURL(encodeURI(this.get3dUrl()), function (img) {
-        if (!img._element) {
-          $document.trigger('PIE:image-error-load');
-          return;
-        }
+    fabric.Image.fromURL(encodeURI(this.get3dUrl()), function (img) {
+      if (!img._element) {
+        $document.trigger('PIE:image-error-load');
+        return;
+      }
 
-        this.get3dHandler().setImage(img);
-        $document.trigger('PIE:image-end-load');
-      }.bind(this));
+      this.get3dHandler().setImage(img);
+      $document.trigger('PIE:image-end-load');
     }.bind(this));
   },
 });
diff --git a/src/Canvas.js b/src/Canvas.js
index ba061ed..cbd062f 100644
--- a/src/Canvas.js
+++ b/src/Canvas.js
@@ -86,6 +86,7 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
       'crop[h]=' + imageData.height,
       'crop[x]=' + imageData.x,
       'crop[y]=' + imageData.y,
+      'no-cache=1',
     ];
 
     if (imageData.mirrored) {
@@ -217,21 +218,14 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
 
     $document.trigger('PIE:image-start-load');
 
-    $.ajax({
-      url: this.get3dUrl(),
-      crossDomain: true,
-      type: 'HEAD',
-      cache: true,
-    }).done(function() {
-      fabric.Image.fromURL(encodeURI(this.get3dUrl()), function (img) {
-        if (!img._element) {
-          $document.trigger('PIE:image-error-load');
-          return;
-        }
+    fabric.Image.fromURL(encodeURI(this.get3dUrl()), function (img) {
+      if (!img._element) {
+        $document.trigger('PIE:image-error-load');
+        return;
+      }
 
-        this.get3dHandler().setImage(img);
-        $document.trigger('PIE:image-end-load');
-      }.bind(this));
+      this.get3dHandler().setImage(img);
+      $document.trigger('PIE:image-end-load');
     }.bind(this));
   },
 });