Merge pull request #6928 from yurydelendik/url-check

Fixes URL polyfill check for MS Edge.
mozilla · Jan 27, 2016 · 1f2910b · 1f2910b
2 parents 0558ffc + bc30c42
commit 1f2910b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/shared/util.js b/src/shared/util.js
@@ -1697,13 +1697,15 @@ function loadJpegStream(id, imageUrl, objs) {
 
   // feature detect for URL constructor
   var hasWorkingUrl = false;
-  if (typeof URL === 'function' && ('origin' in URL.prototype)) {
-    try {
+  try {
+    if (typeof URL === 'function' &&
+        typeof URL.prototype === 'object' &&
+        ('origin' in URL.prototype)) {
       var u = new URL('b', 'http://a');
       u.pathname = 'c%20d';
       hasWorkingUrl = u.href === 'http://a/c%20d';
-    } catch(e) {}
-  }
+    }
+  } catch(e) { }
 
   if (hasWorkingUrl)
     return;