photowall/image-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove double load of 3d image and stop caching

Browse Source
This commit is contained in:
Niklas Fondberg
2020-02-10 13:23:52 +01:00
committed by GitHub
parent e403094514
commit 34e0361eeb
2 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/image-editor.js
Vendored
+8 -14
View File
@@ -451,6 +451,7 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
'crop[h]=' + imageData.height, 'crop[h]=' + imageData.height,
'crop[x]=' + imageData.x, 'crop[x]=' + imageData.x,
'crop[y]=' + imageData.y, 'crop[y]=' + imageData.y,
'no-cache=1',
]; ];
if (imageData.mirrored) { if (imageData.mirrored) {
@@ -582,21 +583,14 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
$document.trigger('PIE:image-start-load'); $document.trigger('PIE:image-start-load');
$.ajax({ fabric.Image.fromURL(encodeURI(this.get3dUrl()), function (img) {
url: this.get3dUrl(), if (!img._element) {
crossDomain: true, $document.trigger('PIE:image-error-load');
type: 'HEAD', return;
cache: true, }
}).done(function() {
fabric.Image.fromURL(encodeURI(this.get3dUrl()), function (img) {
if (!img._element) {
$document.trigger('PIE:image-error-load');
return;
}
this.get3dHandler().setImage(img); this.get3dHandler().setImage(img);
$document.trigger('PIE:image-end-load'); $document.trigger('PIE:image-end-load');
}.bind(this));
}.bind(this)); }.bind(this));
}, },
}); });
src/Canvas.js
+8 -14
View File
@@ -86,6 +86,7 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
'crop[h]=' + imageData.height, 'crop[h]=' + imageData.height,
'crop[x]=' + imageData.x, 'crop[x]=' + imageData.x,
'crop[y]=' + imageData.y, 'crop[y]=' + imageData.y,
'no-cache=1',
]; ];
if (imageData.mirrored) { if (imageData.mirrored) {
@@ -217,21 +218,14 @@ var Canvas = fabric.util.createClass(fabric.Canvas, {
$document.trigger('PIE:image-start-load'); $document.trigger('PIE:image-start-load');
$.ajax({ fabric.Image.fromURL(encodeURI(this.get3dUrl()), function (img) {
url: this.get3dUrl(), if (!img._element) {
crossDomain: true, $document.trigger('PIE:image-error-load');
type: 'HEAD', return;
cache: true, }
}).done(function() {
fabric.Image.fromURL(encodeURI(this.get3dUrl()), function (img) {
if (!img._element) {
$document.trigger('PIE:image-error-load');
return;
}
this.get3dHandler().setImage(img); this.get3dHandler().setImage(img);
$document.trigger('PIE:image-end-load'); $document.trigger('PIE:image-end-load');
}.bind(this));
}.bind(this)); }.bind(this));
}, },
}); });