From bf55ced590f60d3e3cba4fb1138f934508ede693 Mon Sep 17 00:00:00 2001
From: Martin <me.carlsson@gmail.com>
Date: Sat, 5 Aug 2017 01:27:06 +0200
Subject: [PATCH] throw an error if image could not be loaded

---
 dist/image-editor.js | 8 ++++++--
 src/ImageEditor.js   | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dist/image-editor.js b/dist/image-editor.js
index 3233996..db3146b 100644
--- a/dist/image-editor.js
+++ b/dist/image-editor.js
@@ -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;
     };
 
diff --git a/src/ImageEditor.js b/src/ImageEditor.js
index 23ec614..dfcfb4e 100644
--- a/src/ImageEditor.js
+++ b/src/ImageEditor.js
@@ -124,12 +124,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;
     };