diff --git a/src/css/logger-ui.css b/src/css/logger-ui.css index f1d98c71a..c590358be 100644 --- a/src/css/logger-ui.css +++ b/src/css/logger-ui.css @@ -179,8 +179,11 @@ body[dir="rtl"] #netInspector #filterExprPicker { background-color: rgb(var(--primary-70) / 25%); border: 1px solid rgb(var(--primary-70)); } -#netInspector #filterExprPicker span.on[data-filtex] { +#netInspector #filterExprPicker span.on[data-filtex], +#filterExprButton.active { background-color: rgb(var(--primary-70) / 40%); + } +#netInspector #filterExprPicker span.on[data-filtex] { border: 1px solid rgb(var(--primary-70)); } diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js index 64ec2a695..8ea7a333f 100644 --- a/src/js/logger-ui.js +++ b/src/js/logger-ui.js @@ -2213,16 +2213,14 @@ const rowFilterer = (( ) => { dom.cl.toggle(ev.target, 'expanded'); }; - const onToggleBuiltinExpression = function(ev) { + const builtinFilterExpression = function() { builtinFilters.length = 0; - - dom.cl.toggle(ev.target, 'on'); - const filtexElems = qsa$(ev.currentTarget, '[data-filtex]'); + const filtexElems = qsa$('#filterExprPicker [data-filtex]'); const orExprs = []; let not = false; for ( const filtexElem of filtexElems ) { - let filtex = dom.attr(filtexElem, 'data-filtex'); - let active = dom.cl.has(filtexElem, 'on'); + const filtex = filtexElem.dataset.filtex; + const active = dom.cl.has(filtexElem, 'on'); if ( filtex === '!' ) { if ( orExprs.length !== 0 ) { builtinFilters.push({ @@ -2250,11 +2248,15 @@ const rowFilterer = (( ) => { dom.on('#filterButton', 'click', onFilterButton); dom.on('#filterInput > input', 'input', onFilterChangedAsync); dom.on('#filterExprButton', 'click', onToggleExtras); - dom.on('#filterExprPicker', 'click', '[data-filtex]', onToggleBuiltinExpression); + dom.on('#filterExprPicker', 'click', '[data-filtex]', ev => { + dom.cl.toggle(ev.target, 'on'); + builtinFilterExpression(); + }); // https://github.com/gorhill/uBlock/issues/404 // Ensure page state is in sync with the state of its various widgets. parseInput(); + builtinFilterExpression(); filterAll(); return { filterOne, filterAll }; diff --git a/src/logger-ui.html b/src/logger-ui.html index b8d94a251..fc4dae9e6 100644 --- a/src/logger-ui.html +++ b/src/logger-ui.html @@ -66,9 +66,9 @@
tabless
getheadpost
-
+
-
csppermissionsredirect
+
csppermissionsredirect
removeparamurltransform