Only use unhandledrejection fallback when needed

2 files changed, 20 insertions, 16 deletions

diff --git a/vendor/browser-es-module-loader/dist/browser-es-module-loader.js b/vendor/browser-es-module-loader/dist/browser-es-module-loader.js
index 9ff4f15..ad4d1a8 100644
--- a/vendor/browser-es-module-loader/dist/browser-es-module-loader.js
+++ b/vendor/browser-es-module-loader/dist/browser-es-module-loader.js
@@ -1172,15 +1172,17 @@ if (typeof document != 'undefined' && document.getElementsByTagName) {
   function handleError(err) {
     // dispatch an error event so that we can display in errors in browsers
     // that don't yet support unhandledrejection
-    try {
-      var evt = new Event('error');
-    } catch (_eventError) {
-      var evt = document.createEvent('Event');
-      evt.initEvent('error', true, true);
+    if (window.onunhandledrejection === undefined) {
+      try {
+        var evt = new Event('error');
+      } catch (_eventError) {
+        var evt = document.createEvent('Event');
+        evt.initEvent('error', true, true);
+      }
+      evt.message = err.message;
+      evt.error = err;
+      window.dispatchEvent(evt);
     }
-    evt.message = err.message;
-    evt.error = err;
-    window.dispatchEvent(evt);
 
     // throw so it still shows up in the console
     throw err;
diff --git a/vendor/browser-es-module-loader/src/browser-es-module-loader.js b/vendor/browser-es-module-loader/src/browser-es-module-loader.js
index 4df849d..0bfe21b 100644
--- a/vendor/browser-es-module-loader/src/browser-es-module-loader.js
+++ b/vendor/browser-es-module-loader/src/browser-es-module-loader.js
@@ -12,15 +12,17 @@ if (typeof document != 'undefined' && document.getElementsByTagName) {
   function handleError(err) {
     // dispatch an error event so that we can display in errors in browsers
     // that don't yet support unhandledrejection
-    try {
-      var evt = new Event('error');
-    } catch (_eventError) {
-      var evt = document.createEvent('Event');
-      evt.initEvent('error', true, true);
+    if (window.onunhandledrejection === undefined) {
+      try {
+        var evt = new Event('error');
+      } catch (_eventError) {
+        var evt = document.createEvent('Event');
+        evt.initEvent('error', true, true);
+      }
+      evt.message = err.message;
+      evt.error = err;
+      window.dispatchEvent(evt);
     }
-    evt.message = err.message;
-    evt.error = err;
-    window.dispatchEvent(evt);
 
     // throw so it still shows up in the console
     throw err;