throw an error if image could not be loaded
This commit is contained in:
Vendored
+6
-2
@@ -1310,12 +1310,16 @@ function ImageEditor(canvasId, args) {
|
|||||||
*/
|
*/
|
||||||
this.loadImage = function (url, callback) {
|
this.loadImage = function (url, callback) {
|
||||||
callback = typeof callback === 'function' ? callback : function () {};
|
callback = typeof callback === 'function' ? callback : function () {};
|
||||||
fabric.Image.fromURL(this._url = url, function (img) {
|
fabric.util.loadImage(this._url = url, function (obj) {
|
||||||
|
if(obj == null) {
|
||||||
|
throw new Error('Error loading ' + url);
|
||||||
|
}
|
||||||
|
var img = new fabric.Image(obj);
|
||||||
_canvas.setImage(img);
|
_canvas.setImage(img);
|
||||||
img.__url = url;
|
img.__url = url;
|
||||||
img.sendToBack();
|
img.sendToBack();
|
||||||
callback(img);
|
callback(img);
|
||||||
});
|
}, { crossOrigin: 'anonymous' });
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+6
-2
@@ -124,12 +124,16 @@ function ImageEditor(canvasId, args) {
|
|||||||
*/
|
*/
|
||||||
this.loadImage = function (url, callback) {
|
this.loadImage = function (url, callback) {
|
||||||
callback = typeof callback === 'function' ? callback : function () {};
|
callback = typeof callback === 'function' ? callback : function () {};
|
||||||
fabric.Image.fromURL(this._url = url, function (img) {
|
fabric.util.loadImage(this._url = url, function (obj) {
|
||||||
|
if(obj == null) {
|
||||||
|
throw new Error('Error loading ' + url);
|
||||||
|
}
|
||||||
|
var img = new fabric.Image(obj);
|
||||||
_canvas.setImage(img);
|
_canvas.setImage(img);
|
||||||
img.__url = url;
|
img.__url = url;
|
||||||
img.sendToBack();
|
img.sendToBack();
|
||||||
callback(img);
|
callback(img);
|
||||||
});
|
}, { crossOrigin: 'anonymous' });
|
||||||
return this;
|
return this;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user