From bc30c42758e9920af71649845b3deab0c0d052c8 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Tue, 26 Jan 2016 16:49:44 -0600
Subject: [PATCH] Fixes URL polyfill check for MS Edge.
---
src/shared/util.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/shared/util.js b/src/shared/util.js
index 9a9926667..cdc8113e1 100644
--- 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;