Test API availability via property access.

blueimp · blueimp · commit 2989bda436ca · 2020-04-30T17:40:26.000+09:00
diff --git a/js/load-image-fetch.js b/js/load-image-fetch.js
@@ -25,7 +25,9 @@
 })(function (loadImage) {
   'use strict'
 
-  if (typeof fetch !== 'undefined' && typeof Request !== 'undefined') {
+  var global = loadImage.global
+
+  if (global.fetch && global.Request) {
     loadImage.fetchBlob = function (url, callback, options) {
       fetch(new Request(url, options))
         .then(function (response) {
@@ -36,11 +38,8 @@
           callback(null, err)
         })
     }
-  } else if (
-    // Check for XHR2 support:
-    typeof XMLHttpRequest !== 'undefined' &&
-    typeof ProgressEvent !== 'undefined'
-  ) {
+  } else if (global.XMLHttpRequest && global.ProgressEvent) {
+    // Browser supports XHR Level 2 and XHR responseType blob
     loadImage.fetchBlob = function (url, callback, options) {
       // eslint-disable-next-line no-param-reassign
       options = options || {}
diff --git a/test/test.js b/test/test.js
@@ -2518,8 +2518,8 @@
 
   describe('Fetch', function () {
     if (
-      !('fetch' in window && 'Request' in window) &&
-      !('XMLHttpRequest' in window && 'ProgressEvent' in window)
+      !(window.fetch && window.Request) &&
+      !(window.XMLHttpRequest && window.ProgressEvent)
     ) {
       return
     }
