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

Add informative tooltip re. unprocessed requests at launch

Browse source 
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/2585
This commit is contained in:
Raymond Hill 2023-04-09 14:02:01 -04:00
parent a58f375363
commit 9236845c24
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
platform/common/vapi-background.js
View file

@ -676,9 +676,8 @@ if ( webext.browserAction instanceof Object ) {
{
const browserAction = vAPI.browserAction;
const titleTemplate =
browser.runtime.getManifest().browser_action.default_title +
' ({badge})';
const titleTemplate = `${browser.runtime.getManifest().browser_action.default_title} ({badge})`;
const browserLaunchIssue = browser.i18n.getMessage('unprocessedRequestTooltip');
const icons = [
{ path: { '16': 'img/icon_16-off.png', '32': 'img/icon_32-off.png' } },
{ path: { '16': 'img/icon_16.png', '32': 'img/icon_32.png' } },
@ -778,8 +777,9 @@ if ( webext.browserAction instanceof Object ) {
const tab = await vAPI.tabs.get(tabId);
if ( tab === null ) { return; }
const hasUnprocessedRequest = vAPI.net && vAPI.net.hasUnprocessedRequest(tabId);
const { parts, state } = details;
const { badge, color } = vAPI.net && vAPI.net.hasUnprocessedRequest(tabId)
const { badge, color } = hasUnprocessedRequest
? { badge: '!', color: '#FC0' }
: details;
@ -804,13 +804,11 @@ if ( webext.browserAction instanceof Object ) {
// - the platform does not support browserAction.setIcon(); OR
// - the rendering of the badge is disabled
if ( browserAction.setTitle !== undefined ) {
browserAction.setTitle({
tabId: tab.id,
title: titleTemplate.replace(
'{badge}',
const title = hasUnprocessedRequest && browserLaunchIssue ||
titleTemplate.replace('{badge}',
state === 1 ? (badge !== '' ? badge : '0') : 'off'
)
});
);
browserAction.setTitle({ tabId: tab.id, title });
}
if ( vAPI.contextMenu instanceof Object ) {

4
src/_locales/en/messages.json
View file

@ -1265,6 +1265,10 @@
"message": "Click to load",
"description": "Message used in frame placeholders"
},
"unprocessedRequestTooltip": {
"message": "Could not filter properly at browser launch.\nReload the page to ensure proper filtering",
"description": "Tooltip for the toolbar icon. Use newline character(s) where appropriate to prevent tooltip from being too long horizontally"
},
"dummy": {
"message": "This entry must be the last one",
"description": "so we dont need to deal with comma for last entry"