Mirrors
/
noscript
mirror of https://github.com/hackademix/noscript.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for contextual permissions display inconsistencies in options panel (thanks barbaz for reporting).

This commit is contained in:
hackademix 2022-02-23 00:29:31 +01:00
parent c55886fa01
commit 333f52e927
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ui/ui.js
View File

@ -506,13 +506,15 @@ var UI = (() => {
let context = opt.value;
if (context === "*") context = null;
({siteMatch, perms, contextMatch} = policy.get(siteMatch, context));
if (context && contextMatch !== context) {
if (!context) {
row._customPerms = perms;
} else if (contextMatch !== context) {
let temp = row.perms.temp || UI.forceIncognito;
perms = new Permissions(new Set(row.perms.capabilities), temp);
row.perms.contextual.set(context, perms);
fireOnChange(this, row);
}
row.perms = row._customPerms = perms;
row.perms = perms;
row.siteMatch = siteMatch;
row.contextMatch = context;
this.setupCaps(perms, preset, row);
@ -630,11 +632,12 @@ var UI = (() => {
};
for (let child; child = ctxSelect.firstChild;) child.remove();
ctxSelect.appendChild(entry("*", _("anySite")));
let ctxSites = row.perms.contextual;
if (this.mainDomain) {
let key = Sites.optimalKey(this.mainUrl);
ctxSelect.appendChild(entry(key, toLabel(key))).selected = key === row.contextMatch;
} else {
if (!row._customPerms) row._customPerms = row.perms;
let ctxSites = row._customPerms.contextual;
if (ctxSites) {
for (let [site, ctxPerms] of ctxSites.entries()) {
ctxSelect.appendChild(entry(site, toLabel(site))).selected = perms === ctxPerms;