fix: uncaught exceptions, still need to reject promise

AndyOGo · AndyOGo · commit 8e25a70111a1 · 2020-05-07T13:21:22.000+02:00
Revert "fix: uncaught exceptions, still need to reject promise" This reverts commit 5faa5f6. fix: catch uncaught error in scale transformation fix: resolveWrapper never rejected errors Revert "fix: catch uncaught error in scale transformation" This reverts commit 8e93865. fix: catch any transformation error fix: prettier
diff --git a/js/load-image.js b/js/load-image.js
@@ -45,6 +45,9 @@
           // Not using Promises
           if (resolve) resolve(img, data)
           return
+        } else if (img instanceof Error) {
+          reject(img)
+          return
         }
         data = data || {} // eslint-disable-line no-param-reassign
         data.image = img
@@ -159,10 +162,15 @@
 
   loadImage.onload = function (img, event, file, url, callback, options) {
     revokeHelper(url, options)
-    loadImage.transform(img, options, callback, file, {
-      originalWidth: img.naturalWidth || img.width,
-      originalHeight: img.naturalHeight || img.height
-    })
+
+    try {
+      loadImage.transform(img, options, callback, file, {
+        originalWidth: img.naturalWidth || img.width,
+        originalHeight: img.naturalHeight || img.height
+      })
+    } catch (error) {
+      callback(error)
+    }
   }
 
   loadImage.createObjectURL = function (file) {
