Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-06 09:37:12 +02:00
Code Issues Releases Wiki Activity

Code review color badge code

Browse Source 
Related commit:
- 07c950f1e5

Cache [blocking mode, color] pair for fast
lookup in subsequent calls.
This commit is contained in:
Raymond Hill 2019-08-19 09:00:53 -04:00
parent 9a9a43d0f6
commit 5ad809c07d
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/background.js
View File

@ -192,6 +192,7 @@ const µBlock = (function() { // jshint ignore:line
cspNoInlineFont: 'font-src *',
liveBlockingProfiles: [],
blockingProfileColorCache: new Map(),
};
})();

41
src/js/tab.js
View File

@ -953,10 +953,27 @@ vAPI.tabs = new vAPI.Tabs();
// Update visual of extension icon.
µBlock.updateToolbarIcon = (( ) => {
const µb = µBlock;
const tabIdToDetails = new Map();
const updateBadge = function(tabId) {
const µb = µBlock;
const computeBadgeColor = (bits) => {
let color = µb.blockingProfileColorCache.get(bits);
if ( color !== undefined ) { return color; }
let max = 0;
for ( const profile of µb.liveBlockingProfiles ) {
const v = bits & (profile.bits & ~1);
if ( v < max ) { break; }
color = profile.color;
max = v;
}
if ( color === undefined ) {
color = '#666';
}
µb.blockingProfileColorCache.set(bits, color);
return color;
};
const updateBadge = (tabId) => {
const parts = tabIdToDetails.get(tabId);
tabIdToDetails.delete(tabId);
@ -967,22 +984,16 @@ vAPI.tabs = new vAPI.Tabs();
let pageStore = µb.pageStoreFromTabId(tabId);
if ( pageStore !== null ) {
state = pageStore.getNetFilteringSwitch() ? 1 : 0;
if (
state === 1 &&
µb.userSettings.showIconBadge
) {
if ( state === 1 && µb.userSettings.showIconBadge ) {
if ( (parts & 0b010) !== 0 && pageStore.perLoadBlockedRequestCount ) {
badge = µb.formatCount(pageStore.perLoadBlockedRequestCount);
badge = µb.formatCount(
pageStore.perLoadBlockedRequestCount
);
}
if ( (parts & 0b100) !== 0 ) {
const currentBits = µb.blockingModeFromHostname(pageStore.tabHostname);
let max = 0;
for ( const profile of µb.liveBlockingProfiles ) {
const v = currentBits & (profile.bits & ~1);
if ( v < max ) { break; }
color = profile.color;
max = v;
}
color = computeBadgeColor(
µb.blockingModeFromHostname(pageStore.tabHostname)
);
}
}
}

1
src/js/ublock.js
View File

@ -620,6 +620,7 @@ const matchBucket = function(url, hostname, bucket, start) {
profiles.push({ bits, color: color !== '' ? color : '#666' });
});
µBlock.liveBlockingProfiles = profiles;
µBlock.blockingProfileColorCache.clear();
};
parse();