Merge pull request #10407 from brave/fix/getOrigin

Fix getOrigin to work with muon.url.parse
brave · Aug 10, 2017 · 10056bf · 10056bf
2 parents 78a92da + 99ac570
commit 10056bf
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/js/lib/urlutil.js b/js/lib/urlutil.js
@@ -429,11 +429,14 @@ const UrlUtil = {
     }
 
     let parsed = urlParse(location)
+    if (parsed.origin) {
+      // parsed.origin is specific to muon.url.parse
+      return parsed.origin.replace(/\/+$/, '')
+    }
     if (parsed.host && parsed.protocol) {
       return parsed.slashes ? [parsed.protocol, parsed.host].join('//') : [parsed.protocol, parsed.host].join('')
-    } else {
-      return null
     }
+    return null
   }
 }