mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Utilities.Translate.resolveURL() tweaks

Browse source 
- Use `new URL()`, available in all modern environments, instead of
  various other methods. In addition to being consistent and simple,
  this allows setting the base URL explicitly, regardless of the
  environment.
- Default protocol-relative URLs to 'https' if no document location
  (though I'm not sure if that ever happens)
This commit is contained in:
Dan Stillman 2020-08-11 03:40:30 -04:00
parent 8214c85bee
commit c0b6712923
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -1395,22 +1395,14 @@ Zotero.Translate.Base.prototype = {
var m = url.match(hostPortRe), var m = url.match(hostPortRe),
resolved; resolved;
if (!m) { if (!m) {
// Convert relative URLs to absolute if (this.location) {
if(Zotero.isFx && this.location) { resolved = new URL(url, this.location).toString();
resolved = Components.classes["@mozilla.org/network/io-service;1"]. }
getService(Components.interfaces.nsIIOService). else if (url.startsWith('//')) {
newURI(this.location, "", null).resolve(url); // Use HTTPS by default for protocol-relative URL with no associated web page
} else if(Zotero.isNode && this.location) { resolved = 'https:' + url;
resolved = require('url').resolve(this.location, url); }
} else if (this.document) { else {
var a = this.document.createElement('a');
a.href = url;
resolved = a.href;
} else if (url.indexOf('//') == 0) {
// Protocol-relative URL with no associated web page
// Use HTTP by default
resolved = 'http:' + url;
} else {
throw new Error('Cannot resolve relative URL without an associated web page: ' + url); throw new Error('Cannot resolve relative URL without an associated web page: ' + url);
} }
} else if (allowedSchemes.indexOf(m[1].toLowerCase()) == -1) { } else if (allowedSchemes.indexOf(m[1].toLowerCase()) == -1) {