throw an error if image could not be loaded

2017-08-05 01:27:06 +02:00
parent ad42bbfe03
commit bf55ced590
2 changed files with 12 additions and 4 deletions
@@ -1310,12 +1310,16 @@ function ImageEditor(canvasId, args) {
     */
    this.loadImage = function (url, callback) {
        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);
            img.__url = url;
            img.sendToBack();
            callback(img);
-        });
+        }, { crossOrigin: 'anonymous' });
        return this;
    };