Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-06 19:02:30 +01:00
Code Issues Releases Wiki Activity

Fix regression when initializing popup panel

Browse Source 
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1505

Regression from:
- 435c91636f
This commit is contained in:
Raymond Hill 2021-02-21 07:41:09 -05:00
parent 2128d1cf29
commit 266a7507b8
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/messaging.js
View File

@ -263,31 +263,29 @@ const firewallRuleTypes = [
]; ];
const getFirewallRules = function(src, out) { const getFirewallRules = function(src, out) {
const { hostnameDict } = out; const ruleset = out.firewallRules = {};
const ruleset = {};
const df = µb.sessionFirewall; const df = µb.sessionFirewall;
for ( const type of firewallRuleTypes ) { for ( const type of firewallRuleTypes ) {
let r = df.lookupRuleData('*', '*', type); const r = df.lookupRuleData('*', '*', type);
if ( r === undefined ) { continue; } if ( r === undefined ) { continue; }
ruleset[`/ * ${type}`] = r; ruleset[`/ * ${type}`] = r;
} }
if ( typeof src !== 'string' ) { return out; } if ( typeof src !== 'string' ) { return; }
for ( const type of firewallRuleTypes ) { for ( const type of firewallRuleTypes ) {
let r = df.lookupRuleData(src, '*', type); const r = df.lookupRuleData(src, '*', type);
if ( r === undefined ) { continue; } if ( r === undefined ) { continue; }
ruleset[`. * ${type}`] = r; ruleset[`. * ${type}`] = r;
} }
const { hostnameDict } = out;
for ( const des in hostnameDict ) { for ( const des in hostnameDict ) {
let r = df.lookupRuleData('*', des, '*'); let r = df.lookupRuleData('*', des, '*');
if ( r !== undefined ) { ruleset[`/ ${des} *`] = r; } if ( r !== undefined ) { ruleset[`/ ${des} *`] = r; }
r = df.lookupRuleData(src, des, '*'); r = df.lookupRuleData(src, des, '*');
if ( r !== undefined ) { ruleset[`. ${des} *`] = r; } if ( r !== undefined ) { ruleset[`. ${des} *`] = r; }
} }
out.firewallRules = ruleset;
}; };
const popupDataFromTabId = function(tabId, tabTitle) { const popupDataFromTabId = function(tabId, tabTitle) {
@ -358,7 +356,7 @@ const popupDataFromTabId = function(tabId, tabTitle) {
); );
} else { } else {
r.hostnameDict = {}; r.hostnameDict = {};
r.firewallRules = getFirewallRules(); getFirewallRules(undefined, r);
} }
r.matrixIsDirty = µb.sessionFirewall.hasSameRules( r.matrixIsDirty = µb.sessionFirewall.hasSameRules(