Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2020-09-25 22:18:48 +08:00
commit 56aaf6a15a
8042 changed files with 294 additions and 8190 deletions

View file

@ -80,17 +80,21 @@ this.DownloadsViewUI.DownloadElementShell.prototype = {
get extendedDisplayName() {
let s = DownloadsCommon.strings;
let referrer = this.download.source.referrer ||
this.download.source.url;
let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
let [displayHost, fullHost] = DownloadUtils.getURIHost(this.download.source.url);
return s.statusSeparator(this.displayName, displayHost);
},
get extendedDisplayNameTip() {
let s = DownloadsCommon.strings;
let referrer = this.download.source.referrer ||
this.download.source.url;
let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
let referrer = this.download.source.referrer;
if (referrer) {
let [displayHost, fullHost] = DownloadUtils.getURIHost(this.download.source.url) +
' (' +
DownloadUtils.getURIHost(referrer) +
')';
} else {
let [displayHost, fullHost] = DownloadUtils.getURIHost(this.download.source.url);
}
return s.statusSeparator(this.displayName, fullHost);
},