Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Emphasize broken filtering at launch on toolbar icon badge 

Related feedback:
- 769b8da664 (commitcomment-104695781)

The incomplete filtering status of a given tab at browser launch
will be carried over visually as a yellowish `!` badge until the
web page in the tab is force reloaded, navigated away, or closed.

The purpose is to make it obvious to end users that a web page
has not been filtered properly and to avoid issue reports
related to this.

It is expected that Firefox should never be affected by cases of
yellowish badge -- that is unless the setting "Suspend network
activity [...]" has been disabled, in which case the new behavior
will also be useful to those who disabled the setting.
This commit is contained in:
Raymond Hill 2023-03-18 11:35:06 -04:00
parent 4d81e5a8d4
commit 32508620a2
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
platform/common/vapi-background.js
View File

@ -772,7 +772,10 @@ if ( webext.browserAction instanceof Object ) {
const tab = await vAPI.tabs.get(tabId);
if ( tab === null ) { return; }
const { parts, state, badge, color } = details;
const { parts, state } = details;
const { badge, color } = vAPI.net && vAPI.net.hasUnprocessedRequest(tabId)
? { badge: '!', color: '#FC0' }
: details;
if ( browserAction.setIcon !== undefined ) {
if ( parts === undefined || (parts & 0b0001) !== 0 ) {
@ -1174,9 +1177,10 @@ vAPI.Net = class {
}
}
this.suspendableListener = undefined;
this.deferredSuspendableListener = undefined;
this.listenerMap = new WeakMap();
this.suspendDepth = 0;
this.unprocessedRequestCount = 0;
this.unprocessedTabs = new Set();
browser.webRequest.onBeforeRequest.addListener(
details => {
@ -1234,9 +1238,24 @@ vAPI.Net = class {
if ( this.suspendableListener !== undefined ) {
return this.suspendableListener(details);
}
this.onUnprocessedRequest();
this.onUnprocessedRequest(details);
}
setSuspendableListener(listener) {
if ( this.unprocessedTabs.size !== 0 ) {
this.deferredSuspendableListener = listener;
listener = details => {
const { tabId, type } = details;
if ( type === 'main_frame' && this.unprocessedTabs.has(tabId) ) {
this.unprocessedTabs.delete(tabId);
if ( this.unprocessedTabs.size === 0 ) {
this.suspendableListener = this.deferredSuspendableListener;
this.deferredSuspendableListener = undefined;
return this.suspendableListener(details);
}
}
return this.deferredSuspendableListener(details);
};
}
this.suspendableListener = listener;
vAPI.setDefaultIcon('', '');
}
@ -1254,11 +1273,16 @@ vAPI.Net = class {
this.listenerMap.set(clientListener, actualListener);
return actualListener;
}
onUnprocessedRequest() {
if ( this.unprocessedRequestCount === 0 ) {
onUnprocessedRequest(details) {
if ( details.tabId === -1 ) { return; }
if ( this.unprocessedTabs.size === 0 ) {
vAPI.setDefaultIcon('-loading', '!');
}
this.unprocessedRequestCount += 1;
this.unprocessedTabs.add(details.tabId);
}
hasUnprocessedRequest(tabId) {
return this.unprocessedTabs.size !== 0 &&
this.unprocessedTabs.has(tabId);
}
suspendOneRequest() {
}