Remove port when constructing menu match patterns

This commit is contained in:
hensm
2020-07-26 00:30:22 +01:00
parent 84c99ba257
commit e7f99680bf

View File

@@ -303,13 +303,15 @@ async function initMenus () {
// If there is more than one subdomain, get the base domain // If there is more than one subdomain, get the base domain
const baseDomain = (url.host.match(/\./g) || []).length > 1 const baseDomain = (url.hostname.match(/\./g) || []).length > 1
? url.host.substring(url.host.indexOf(".") + 1) ? url.hostname.substring(url.hostname.indexOf(".") + 1)
: url.host; : url.hostname;
const patternRecommended = `${url.origin}/*`; const portlessOrigin = `${url.protocol}://${url.hostname}`;
const patternSearch = `${url.origin}${url.pathname}${url.search}`;
const patternWildcardProtocol = `*://${url.host}/*`; const patternRecommended = `${portlessOrigin}/*`;
const patternSearch = `${portlessOrigin}${url.pathname}${url.search}`;
const patternWildcardProtocol = `*://${url.hostname}/*`;
const patternWildcardSubdomain = `${url.protocol}//*.${baseDomain}/*`; const patternWildcardSubdomain = `${url.protocol}//*.${baseDomain}/*`;
const patternWildcardProtocolAndSubdomain = `*://*.${baseDomain}/*`; const patternWildcardProtocolAndSubdomain = `*://*.${baseDomain}/*`;
@@ -354,7 +356,7 @@ async function initMenus () {
.reverse() .reverse()
.join("/"); .join("/");
const pattern = `${url.origin}/${partialPath}/*`; const pattern = `${portlessOrigin}/${partialPath}/*`;
const partialPathMenuId = browser.menus.create({ const partialPathMenuId = browser.menus.create({
title: _("contextAddToWhitelistAdvancedAdd", pattern) title: _("contextAddToWhitelistAdvancedAdd", pattern)