Always honor the "Collapse blocked objects" option.

hackademix · hackademix · commit 1c6af764f477 · 2025-04-21T17:54:52.000+02:00
diff --git a/src/bg/RequestGuard.js b/src/bg/RequestGuard.js
@@ -334,6 +334,7 @@
         }
         options.push({label: _("allowLocal", origin)});
       }
+      const OPT_COLLAPSE = options.length;
       options.push({label: _("CollapseBlockedObjects")});
       let t = u => `${TAG}@${u}`;
       let ret = await Prompts.prompt({
@@ -342,7 +343,7 @@
         options});
       debug(`Prompt returned`, ret, sender); // DEV_ONLY
       if (ret.button !== 0) return;
-      if (ret.option === 2) {
+      if (ret.option === OPT_COLLAPSE) {
         return {collapse: "all"};
       }
       let key = [siteKey, origin][ret.option || 0];

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,7 @@`
`334`	`334`	`}`
`335`	`335`	`options.push({label: _("allowLocal", origin)});`
`336`	`336`	`}`
	`337`	`+ const OPT_COLLAPSE = options.length;`
`337`	`338`	`options.push({label: _("CollapseBlockedObjects")});`
`338`	`339`	let t = u => `${TAG}@${u}`;
`339`	`340`	`let ret = await Prompts.prompt({`
`@@ -342,7 +343,7 @@`
`342`	`343`	`options});`
`343`	`344`	debug(`Prompt returned`, ret, sender); // DEV_ONLY
`344`	`345`	`if (ret.button !== 0) return;`
`345`		`- if (ret.option === 2) {`
	`346`	`+ if (ret.option === OPT_COLLAPSE) {`
`346`	`347`	`return {collapse: "all"};`
`347`	`348`	`}`
`348`	`349`	`let key = [siteKey, origin][ret.option \|\| 0];`