gorhill
diff --git a/‎src/css/logger-ui.css
Copy file name to clipboard
+21Lines changed: 21 additions & 0 deletions b/‎src/css/logger-ui.css
Copy file name to clipboard
+21Lines changed: 21 additions & 0 deletions
diff --git a/‎src/js/background.js
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/js/background.js
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/js/cosmetic-filtering.js
Copy file name to clipboard
+12-3Lines changed: 12 additions & 3 deletions b/‎src/js/cosmetic-filtering.js
Copy file name to clipboard
+12-3Lines changed: 12 additions & 3 deletions
diff --git a/‎src/js/html-filtering.js
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎src/js/html-filtering.js
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/js/logger-ui.js
Copy file name to clipboard
+74-35Lines changed: 74 additions & 35 deletions b/‎src/js/logger-ui.js
Copy file name to clipboard
+74-35Lines changed: 74 additions & 35 deletions
@@ -660,6 +660,7 @@ body[dir="rtl"] #netFilteringDialog > .panes > .details > div > span:nth-of-type
     border-left: 1px solid white;
     }
 #netFilteringDialog > .panes > .details > div > span:nth-of-type(2) {
+    flex-grow: 1;
     max-height: 20vh;
     overflow: hidden auto;
     white-space: pre-line
@@ -675,6 +676,26 @@ body[dir="rtl"] #netFilteringDialog > .panes > .details > div > span:nth-of-type
 #netFilteringDialog > .panes > .details > div > span:nth-of-type(2) .fa-icon:hover {
     opacity: 1;
     }
+#netFilteringDialog > .panes > .details .exceptor {
+    align-items: center;
+    border-left: 1px solid white;
+    cursor: pointer;
+    display: inline-flex;
+    font-family: monospace;
+    opacity: 0.8;
+    }
+#netFilteringDialog > .panes > .details .exceptor:hover {
+    opacity: 1;
+    }
+#netFilteringDialog > .panes > .details .exceptored .filter {
+    text-decoration: line-through;
+    }
+#netFilteringDialog > .panes > .details .exceptored .exceptor {
+    background-color: lightblue;
+    }
+#netFilteringDialog > .panes > .details .exceptor::before {
+    content: '#@#';
+    }
 #netFilteringDialog > div.panes > .dynamic > .toolbar {
     padding-bottom: 1em;
     }
 
@@ -53,6 +53,7 @@ const µBlock = (( ) => { // jshint ignore:line
         extensionUpdateForceReload: false,
         ignoreRedirectFilters: false,
         ignoreScriptInjectFilters: false,
+        filterAuthorMode: false,
         loggerPopupType: 'popup',
         manualUpdateAssetFetchPeriod: 500,
         popupFontSize: 'unset',
 
@@ -826,6 +826,12 @@ FilterContainer.prototype.randomAlphaToken = function() {
 
 /******************************************************************************/
 
+FilterContainer.prototype.getSession = function() {
+    return this.specificFilters.session;
+};
+
+/******************************************************************************/
+
 FilterContainer.prototype.retrieveGenericSelectors = function(request) {
     if ( this.acceptedCount === 0 ) { return; }
     if ( !request.ids && !request.classes ) { return; }
@@ -990,20 +996,23 @@ FilterContainer.prototype.retrieveSpecificSelectors = function(
             }
         }
 
+        // Retrieve temporary filters
+        this.specificFilters.session.retrieve([ dummySet, exceptionSet ]);
+
         // Retrieve filters with a non-empty hostname
         this.specificFilters.retrieve(
             hostname,
             options.noSpecificCosmeticFiltering !== true
                 ? [ specificSet, exceptionSet, proceduralSet, exceptionSet ]
-                : [ dummySet, exceptionSet, dummySet, exceptionSet ],
+                : [ dummySet, exceptionSet ],
             1
         );
         // Retrieve filters with an empty hostname
         this.specificFilters.retrieve(
             hostname,
             options.noGenericCosmeticFiltering !== true
                 ? [ specificSet, exceptionSet, proceduralSet, exceptionSet ]
-                : [ dummySet, exceptionSet, dummySet, exceptionSet ],
+                : [ dummySet, exceptionSet ],
             2
         );
         // Retrieve filters with a non-empty entity
@@ -1012,7 +1021,7 @@ FilterContainer.prototype.retrieveSpecificSelectors = function(
                 `${hostname.slice(0, -request.domain.length)}${request.entity}`,
                 options.noSpecificCosmeticFiltering !== true
                     ? [ specificSet, exceptionSet, proceduralSet, exceptionSet ]
-                    : [ dummySet, exceptionSet, dummySet, exceptionSet ],
+                    : [ dummySet, exceptionSet ],
                 1
             );
         }
 
@@ -334,6 +334,10 @@
         }
     };
 
+    api.getSession = function() {
+        return filterDB.session;
+    };
+
     api.retrieve = function(details) {
         const hostname = details.hostname;
 
@@ -350,6 +354,7 @@
         const procedurals = new Set();
         const exceptions = new Set();
 
+        filterDB.session.retrieve([ new Set(), exceptions ]);
         filterDB.retrieve(
             hostname,
             [ plains, exceptions, procedurals, exceptions ]
 
@@ -41,6 +41,7 @@ let filteredLoggerEntryVoidedCount = 0;
 let popupLoggerBox;
 let popupLoggerTooltips;
 let activeTabId = 0;
+let filterAuthorMode = false;
 let selectedTabId = 0;
 let netInspectorPaused = false;
 
@@ -64,7 +65,7 @@ const tabIdFromAttribute = function(elem) {
 
 // Current design allows for only one modal DOM-based dialog at any given time.
 //
-const modalDialog = (function() {
+const modalDialog = (( ) => {
     const overlay = uDom.nodeFromId('modalOverlay');
     const container = overlay.querySelector(
         ':scope > div > div:nth-of-type(1)'
@@ -949,6 +950,8 @@ const onLogBufferRead = function(response) {
         allTabIdsToken = response.tabIdsToken;
     }
 
+    filterAuthorMode = response.filterAuthorMode === true;
+
     if ( activeTabIdChanged ) {
         pageSelectorFromURLHash();
     }
@@ -1085,7 +1088,7 @@ const reloadTab = function(ev) {
 /******************************************************************************/
 /******************************************************************************/
 
-(function() {
+(( ) => {
     const reRFC3986 = /^([^:\/?#]+:)?(\/\/[^\/?#]*)?([^?#]*)(\?[^#]*)?(#.*)?/;
     const reSchemeOnly = /^[\w-]+:$/;
     const staticFilterTypes = {
@@ -1203,24 +1206,35 @@ const reloadTab = function(ev) {
         );
     };
 
-    const onClick = function(ev) {
+    const onClick = async function(ev) {
         const target = ev.target;
         const tcl = target.classList;
 
         // Select a mode
         if ( tcl.contains('header') ) {
-            dialog.setAttribute('data-pane', target.getAttribute('data-pane') );
             ev.stopPropagation();
+            dialog.setAttribute('data-pane', target.getAttribute('data-pane') );
             return;
         }
 
+        // Toggle temporary exception filter
+        if ( tcl.contains('exceptor') ) {
+            ev.stopPropagation();
+            const status = await messaging.send('loggerUI', {
+                what: 'toggleTemporaryException',
+                filter: filterFromTargetRow(),
+            });
+            const row = target.closest('div');
+            row.classList.toggle('exceptored', status);
+            return;
+        }
+        
         // Create static filter
         if ( target.id === 'createStaticFilter' ) {
+            ev.stopPropagation();
             const value = staticFilterNode().value;
             // Avoid duplicates
-            if ( createdStaticFilters.hasOwnProperty(value) ) {
-                return;
-            }
+            if ( createdStaticFilters.hasOwnProperty(value) ) { return; }
             createdStaticFilters[value] = true;
             if ( value !== '' ) {
                 messaging.send('loggerUI', {
@@ -1232,109 +1246,103 @@ const reloadTab = function(ev) {
                 });
             }
             updateWidgets();
-            ev.stopPropagation();
             return;
         }
 
         // Save url filtering rule(s)
         if ( target.id === 'saveRules' ) {
-            messaging.send('loggerUI', {
+            ev.stopPropagation();
+            await messaging.send('loggerUI', {
                 what: 'saveURLFilteringRules',
                 context: selectValue('select.dynamic.origin'),
                 urls: targetURLs,
                 type: uglyTypeFromSelector('dynamic'),
-            }).then(( ) => {
-                colorize();
             });
-            ev.stopPropagation();
+            colorize();
             return;
         }
 
         const persist = !!ev.ctrlKey || !!ev.metaKey;
 
         // Remove url filtering rule
         if ( tcl.contains('action') ) {
-            messaging.send('loggerUI', {
+            ev.stopPropagation();
+            await messaging.send('loggerUI', {
                 what: 'setURLFilteringRule',
                 context: selectValue('select.dynamic.origin'),
                 url: target.getAttribute('data-url'),
                 type: uglyTypeFromSelector('dynamic'),
                 action: 0,
                 persist: persist,
-            }).then(( ) => {
-                colorize();
             });
-            ev.stopPropagation();
+            colorize();
             return;
         }
 
         // add "allow" url filtering rule
         if ( tcl.contains('allow') ) {
-            messaging.send('loggerUI', {
+            ev.stopPropagation();
+            await messaging.send('loggerUI', {
                 what: 'setURLFilteringRule',
                 context: selectValue('select.dynamic.origin'),
                 url: target.parentNode.getAttribute('data-url'),
                 type: uglyTypeFromSelector('dynamic'),
                 action: 2,
                 persist: persist,
-            }).then(( ) => {
-                colorize();
             });
-            ev.stopPropagation();
+            colorize();
             return;
         }
 
         // add "block" url filtering rule
         if ( tcl.contains('noop') ) {
-            messaging.send('loggerUI', {
+            ev.stopPropagation();
+            await messaging.send('loggerUI', {
                 what: 'setURLFilteringRule',
                 context: selectValue('select.dynamic.origin'),
                 url: target.parentNode.getAttribute('data-url'),
                 type: uglyTypeFromSelector('dynamic'),
                 action: 3,
                 persist: persist,
-            }).then(( ) => {
-                colorize();
             });
-            ev.stopPropagation();
+            colorize();
             return;
         }
 
         // add "block" url filtering rule
         if ( tcl.contains('block') ) {
-            messaging.send('loggerUI', {
+            ev.stopPropagation();
+            await messaging.send('loggerUI', {
                 what: 'setURLFilteringRule',
                 context: selectValue('select.dynamic.origin'),
                 url: target.parentNode.getAttribute('data-url'),
                 type: uglyTypeFromSelector('dynamic'),
                 action: 1,
                 persist: persist,
-            }).then(( ) => {
-                colorize();
             });
-            ev.stopPropagation();
+            colorize();
             return;
         }
 
         // Force a reload of the tab
         if ( tcl.contains('reload') ) {
+            ev.stopPropagation();
             messaging.send('loggerUI', {
                 what: 'reloadTab',
                 tabId: targetTabId,
             });
-            ev.stopPropagation();
             return;
         }
 
         // Hightlight corresponding element in target web page
         if ( tcl.contains('picker') ) {
+            ev.stopPropagation();
             messaging.send('loggerUI', {
                 what: 'launchElementPicker',
                 tabId: targetTabId,
                 targetURL: 'img\t' + targetURLs[0],
                 select: true,
             });
-            ev.stopPropagation();
             return;
         }
     };
@@ -1426,6 +1434,37 @@ const reloadTab = function(ev) {
         return urls;
     };
 
+    const filterFromTargetRow = function() {
+        return targetRow.children[1].textContent;
+    };
+
+    const toSummaryPaneFilterNode = async function(receiver, filter) {
+        receiver.children[1].textContent = filter;
+        if ( filterAuthorMode !== true ) { return; }
+        const match = /#@?#/.exec(filter);
+        if ( match === null ) { return; }
+        const fragment = document.createDocumentFragment();
+        fragment.appendChild(document.createTextNode(match[0]));
+        const selector = filter.slice(match.index + match[0].length);
+        const span = document.createElement('span');
+        span.className = 'filter';
+        span.textContent = selector;
+        fragment.appendChild(span);
+        let isTemporaryException = false;
+        if ( match[0] === '#@#' ) {
+            isTemporaryException = await messaging.send('loggerUI', {
+                what: 'hasTemporaryException',
+                filter,
+            });
+            receiver.classList.toggle('exceptored', isTemporaryException);
+        }
+        if ( match[0] === '##' || isTemporaryException ) {
+            receiver.children[2].style.visibility = '';
+        }
+        receiver.children[1].textContent = '';
+        receiver.children[1].appendChild(fragment);
+    };
+
     const fillSummaryPaneFilterList = async function(rows) {
         const rawFilter = targetRow.children[1].textContent;
         const compiledFilter = targetRow.getAttribute('data-filter');
@@ -1468,7 +1507,7 @@ const reloadTab = function(ev) {
                 bestMatchFilter !== '' &&
                 Array.isArray(response[bestMatchFilter])
             ) {
-                rows[0].children[1].textContent = bestMatchFilter;
+                toSummaryPaneFilterNode(rows[0], bestMatchFilter);
                 rows[1].children[1].appendChild(nodeFromFilter(
                     bestMatchFilter,
                     response[bestMatchFilter]
@@ -1499,7 +1538,7 @@ const reloadTab = function(ev) {
             });
             handleResponse(response);
         }
-    };
+    } ;
 
     const fillSummaryPane = function() {
         const rows = dialog.querySelectorAll('.pane.details > div');
@@ -1508,12 +1547,12 @@ const reloadTab = function(ev) {
         const trch = tr.children;
         let text;
         // Filter and context
-        text = trch[1].textContent;
+        text = filterFromTargetRow();
         if (
             (text !== '') &&
             (trcl.contains('cosmeticRealm') || trcl.contains('networkRealm'))
         ) {
-            rows[0].children[1].textContent = text;
+            toSummaryPaneFilterNode(rows[0], text);
         } else {
             rows[0].style.display = 'none';
         }
@@ -1753,7 +1792,7 @@ const reloadTab = function(ev) {
         fillSummaryPane();
         fillDynamicPane();
         fillStaticPane();
-        dialog.addEventListener('click', onClick, true);
+        dialog.addEventListener('click', ev => { onClick(ev); }, true);
         dialog.addEventListener('change', onSelectChange, true);
         dialog.addEventListener('input', onInputChange, true);
         modalDialog.show();