Remove double load of 3d image and stop caching

2020-02-10 13:23:52 +01:00
parent e403094514
commit 34e0361eeb
2 changed files with 16 additions and 28 deletions
@@ -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));
  },
 });