prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix regression in set-constantscriptlet"

Browse source 
This reverts commit b7441bb9c0.
This commit is contained in:
Raymond Hill 2024-12-09 08:19:43 -05:00
parent fa87e6d830
commit 7daa45e49f
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/mv3/extension/js/debug.js
View file

@ -20,7 +20,6 @@
*/
import { dnr } from './ext.js';
import { getDynamicRules } from './ext-compat.js';
/******************************************************************************/
@ -54,7 +53,7 @@ const getRuleset = async rulesetId => {
}
let rules;
if ( rulesetId === dnr.DYNAMIC_RULESET_ID ) {
rules = await getDynamicRules().catch(( ) => undefined);
rules = await dnr.getDynamicRules().catch(( ) => undefined);
} else {
const response = await fetch(`/rulesets/main/${rulesetId}.json`).catch(( ) => undefined);
if ( response === undefined ) { return; }

15
platform/mv3/extension/js/ruleset-manager.js
View file

@ -26,11 +26,6 @@ import {
runtime,
} from './ext.js';
import {
getDynamicRules,
getSessionRules,
} from './ext-compat.js';
import {
localRead, localRemove, localWrite,
sessionRead, sessionRemove, sessionWrite,
@ -368,8 +363,8 @@ async function commitStrictBlockRules() {
beforePermanentRules,
beforeTemporaryRules,
] = await Promise.all([
getDynamicRules({ ruleIds: [ STRICTBLOCK_BASE_RULE_ID ] }),
getSessionRules({ ruleIds: [ STRICTBLOCK_BASE_RULE_ID ] }),
dnr.getDynamicRules({ ruleIds: [ STRICTBLOCK_BASE_RULE_ID ] }),
dnr.getSessionRules({ ruleIds: [ STRICTBLOCK_BASE_RULE_ID ] }),
]);
if ( beforePermanentRules?.length ) {
ubolLog(`Remove 1 DNR dynamic strictblock rule`);
@ -427,11 +422,11 @@ async function updateDynamicRules() {
dynamicRuleIds,
sessionRuleIds,
] = await Promise.all([
getDynamicRules().then(rules =>
dnr.getDynamicRules().then(rules =>
rules.map(rule => rule.id)
.filter(id => id < TRUSTED_DIRECTIVE_BASE_RULE_ID)
),
getSessionRules().then(rules => rules.map(rule => rule.id)),
dnr.getSessionRules().then(rules => rules.map(rule => rule.id)),
updateRegexRules(dynamicRules),
updateRemoveparamRules(dynamicRules),
updateRedirectRules(dynamicRules),
@ -480,7 +475,7 @@ async function updateDynamicRules() {
/******************************************************************************/
async function filteringModesToDNR(modes) {
const trustedRules = await getDynamicRules({
const trustedRules = await dnr.getDynamicRules({
ruleIds: [ TRUSTED_DIRECTIVE_BASE_RULE_ID+0 ],
});
const trustedRule = trustedRules.length !== 0 && trustedRules[0] || undefined;

1
src/js/resources/set-constant.js
View file

@ -61,6 +61,7 @@ export function validateConstantFn(trusted, raw, extraArgs = {}) {
} else if ( raw.startsWith('{') && raw.endsWith('}') ) {
try { value = safe.JSON_parse(raw).value; } catch(ex) { return; }
}
return raw;
} else {
return;
}