uBlockOrigin
diff --git a/‎chromium/_locales/id/messages.json‎
Lines changed: 2 additions & 2 deletions b/‎chromium/_locales/id/messages.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎chromium/css/settings.css‎
Lines changed: 7 additions & 2 deletions b/‎chromium/css/settings.css‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎chromium/js/background.js‎
Lines changed: 25 additions & 0 deletions b/‎chromium/js/background.js‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎chromium/js/filter-manager-ui.js‎
Lines changed: 63 additions & 26 deletions b/‎chromium/js/filter-manager-ui.js‎
Lines changed: 63 additions & 26 deletions
diff --git a/‎chromium/js/filter-manager.js‎
Lines changed: 2 additions & 0 deletions b/‎chromium/js/filter-manager.js‎
Lines changed: 2 additions & 0 deletions
@@ -312,15 +312,15 @@
     "description": "Label for checkbox in document-blocked page"
   },
   "strictblockProceed": {
-    "message": "Lanjutkan",
+    "message": "Proceed",
     "description": "A button to navigate to the blocked page"
   },
   "zapperTipEnter": {
     "message": "Masuk ke mode penghapus elemen",
     "description": "Tooltip for the button used to enter zapper mode"
   },
   "zapperTipQuit": {
-    "message": "Keluar dari mode penghapus elemen",
+    "message": "Mbyll asgjësuesin e elementeve",
     "description": "Tooltip for the button used to exit zapper mode"
   },
   "pickerTipEnter": {
 
@@ -257,10 +257,12 @@ section[data-pane="filters"] ul {
     margin: 0;
     padding-inline-start: 0;
     }
-section[data-pane="filters"] .hostnames > li.hostname > div {
-    background-color: var(--surface-2);
+section[data-pane="filters"] li[data-pretty] > div {
     padding-inline-start: 0.5em;
     }
+section[data-pane="filters"] li.hostname > div {
+    background-color: var(--surface-2);
+    }
 section[data-pane="filters"] ul ul {
     padding-block-end: 1em;
     padding-inline-start: 0.5em;
@@ -342,6 +344,9 @@ section[data-pane="filters"] aside p {
     flex-wrap: wrap;
     gap: 1em;
     }
+section[data-pane="filters"] li.error[data-pretty] > div span[contenteditable] {
+    color: var(--info3-ink);
+    }
 
 @media (max-width: 480px) {
     #defaultFilteringMode {
 
@@ -57,6 +57,7 @@ import {
     broadcastMessage,
     hostnameFromMatch,
     hostnamesFromMatches,
+    intFromVersion,
 } from './utils.js';
 
 import {
@@ -664,10 +665,34 @@ async function startSession() {
     // The default rulesets may have changed, find out new ruleset to enable,
     // obsolete ruleset to remove.
     if ( isNewVersion ) {
+        const previousVersion = rulesetConfig.version;
         ubolLog(`Version change: ${rulesetConfig.version} => ${currentVersion}`);
         rulesetConfig.version = currentVersion;
         await patchDefaultRulesets();
         saveRulesetConfig();
+        // https://github.com/uBlockOrigin/uBOL-home/issues/670
+        if ( intFromVersion(previousVersion) <= intFromVersion('2026.423.0000') ) {
+            const promises = [];
+            const customFilters = await getAllCustomFilters();
+            for ( const [ hostname, selectors ] of customFilters ) {
+                let modified = false;
+                for ( let i = 0; i < selectors.length; i++ ) {
+                    const selector = selectors[i];
+                    if ( selector.startsWith('0') === false ) { continue; }
+                    selectors[i] = selector.slice(1);
+                    modified = true;
+                }
+                if ( modified === false ) { continue; }
+                promises.push(
+                    removeAllCustomFilters(hostname).then(( ) =>
+                        addCustomFilters(hostname, selectors)
+                    )
+                );
+            }
+            if ( promises.length !== 0 ) {
+                await Promise.all(promises);
+            }
+        }
     }
 
     const rulesetsUpdated = await enableRulesets(rulesetConfig.enabledRulesets);
 
@@ -30,6 +30,15 @@ const dataContainer = qs$('section[data-pane="filters"] .hostnames');
 
 /******************************************************************************/
 
+function getSFP() {
+    if ( getSFP.sfp === undefined ) {
+        getSFP.sfp = import('./static-filtering-parser.js');
+    }
+    return getSFP.sfp;
+}
+
+/******************************************************************************/
+
 function isValidHostname(hostname) {
     try {
         const url = new URL(`https://${hostname}/`);
@@ -234,6 +243,29 @@ function updateContentEditability() {
 
 /******************************************************************************/
 
+async function validateSelector(target, selector) {
+    const sfp = await getSFP();
+    const parser = new sfp.AstFilterParser({
+        nativeCssHas: true,
+        trustedSource: true,
+    });
+    parser.parse(`##${selector}`);
+    let pretty, ugly;
+    if ( parser.hasError() === false ) {
+        if ( parser.isScriptletFilter() ) {
+            pretty = `+js(${parser.getTypeString(sfp.NODE_TYPE_EXT_PATTERN_SCRIPTLET)})`;
+            ugly = pretty;
+        } else if ( parser.isCosmeticFilter() ) {
+            pretty = parser.getTypeString(sfp.NODE_TYPE_EXT_PATTERN_COSMETIC);
+            ugly = parser.result.compiled;
+        }
+    }
+    if ( Boolean(pretty) === false ) { return {}; }
+    return { pretty, ugly };
+}
+
+/******************************************************************************/
+
 async function onHostnameChanged(target, before, after) {
     const uglyAfter = punycode.toASCII(after);
     if ( isValidHostname(uglyAfter) === false ) {
@@ -272,45 +304,29 @@ async function onSelectorChanged(target, before, after) {
     if ( selectorNode === null ) { return; }
 
     // Validate selector
-    const sfp = await import('./static-filtering-parser.js');
-    const parser = new sfp.AstFilterParser({
-        nativeCssHas: true,
-        trustedSource: true,
-    });
-    const hostname = hostnameFromNode(target);
-    parser.parse(`##${after}`);
-    if ( parser.hasError() ) {
-        target.textContent = before;
-        return;
-    }
-    let prettySelector, uglySelector;
-    if ( parser.isScriptletFilter() ) {
-        prettySelector = `+js(${parser.getTypeString(sfp.NODE_TYPE_EXT_PATTERN_SCRIPTLET)})`;
-        uglySelector = prettySelector;
-    } else if ( parser.isCosmeticFilter() ) {
-        prettySelector = parser.getTypeString(sfp.NODE_TYPE_EXT_PATTERN_COSMETIC);
-        uglySelector = parser.result.compiled;
-    }
-    if ( Boolean(prettySelector) === false ) {
+    const { pretty, ugly } = await validateSelector(target, after);
+    if ( Boolean(pretty) === false ) {
         target.textContent = before;
         return;
     }
 
     dom.cl.add(dom.body, 'readonly');
     updateContentEditability();
 
+    const hostname = hostnameFromNode(target);
+
     // Remove old selector from storage
     await sendMessage({ what: 'removeCustomFilters',
         hostname,
         selectors: [ selectorNode.dataset.ugly ],
     });
 
     // Add new selector to storage
-    selectorNode.dataset.ugly = uglySelector;
-    selectorNode.dataset.pretty = prettySelector;
+    selectorNode.dataset.ugly = ugly;
+    selectorNode.dataset.pretty = pretty;
     await sendMessage({ what: 'addCustomFilters',
         hostname,
-        selectors: [ uglySelector ],
+        selectors: [ ugly ],
     });
 
     await debounceRenderCustomFilters();
@@ -321,12 +337,13 @@ async function onSelectorChanged(target, before, after) {
 function onTextChanged(target) {
     const itemNode = target.closest('[data-pretty]');
     if ( itemNode === null ) { return; }
+    dom.cl.remove(itemNode, 'error');
     const before = itemNode.dataset.pretty;
     const after = target.textContent.trim().replace('\n', '');
     if ( after !== target.textContent ) {
         target.textContent = after;
     }
-    if ( after === before ) { return; }
+    if ( before !== '' && after === before ) { return; }
     if ( after === '' ) {
         target.textContent = before;
         return;
@@ -355,12 +372,32 @@ function endEdit(ev) {
 function commitEdit(ev) {
     const { target } = ev;
     if ( target === focusedEditableContent ) {
-        if ( ev.inputType === 'insertLineBreak' ) { target.blur(); }
+        if ( ev.inputType === 'insertLineBreak' ) {
+            target.blur();
+        } else {
+            validateEdit(ev);
+        }
         return;
     }
     onTextChanged(target);
 }
 
+function validateEdit(ev) {
+    const { target } = ev;
+    const itemNode = target.closest('[data-pretty]');
+    if ( itemNode === null ) { return; }
+    const after = target.textContent.trim().replace('\n', '');
+    if ( after === '' ) { return; }
+    if ( target.matches('.selector') ) {
+        validateSelector(target, after).then(({ pretty }) => {
+            if ( focusedEditableContent !== target ) { return; }
+            dom.cl.toggle(itemNode, 'error', after !== '' && Boolean(pretty) === false);
+        });
+    } else if ( target.matches('.hostname') ) {
+        dom.cl.toggle(itemNode, 'error', isValidHostname(punycode.toASCII(after)) === false);
+    }
+}
+
 let focusedEditableContent = null;
 
 /******************************************************************************/
@@ -400,7 +437,7 @@ function onUndoClicked(ev) {
 /******************************************************************************/
 
 async function importFromText(text) {
-    const sfp = await import('./static-filtering-parser.js');
+    const sfp = await getSFP();
     const parser = new sfp.AstFilterParser({
         nativeCssHas: true,
         trustedSource: true,
 
@@ -363,6 +363,8 @@ registerCustomScriptlets.create = async function() {
         await browser.userScripts.unregister();
         ubolLog(`Unregistered userscript ${toRemove.map(v => v.id)}`);
     }
+    const customFilters = await getAllCustomFilters();
+    if ( customFilters.some(a => a[1].some(b => isScriptlet(b))) === false ) { return; }
     const { promise: offscreenPromise, resolve: offscreenResolve } = Promise.withResolvers();
     const handler = (msg, sender, callback) => {
         if ( typeof msg !== 'object' ) { return; }
Original file line number	Diff line number	Diff line change
`@@ -363,6 +363,8 @@ registerCustomScriptlets.create = async function() {`
`363`	`363`	`await browser.userScripts.unregister();`
`364`	`364`	ubolLog(`Unregistered userscript ${toRemove.map(v => v.id)}`);
`365`	`365`	`}`
	`366`	`+ const customFilters = await getAllCustomFilters();`
	`367`	`+ if ( customFilters.some(a => a[1].some(b => isScriptlet(b))) === false ) { return; }`
`366`	`368`	`const { promise: offscreenPromise, resolve: offscreenResolve } = Promise.withResolvers();`
`367`	`369`	`const handler = (msg, sender, callback) => {`
`368`	`370`	`if ( typeof msg !== 'object' ) { return; }`