mirror of
https://github.com/gorhill/uBlock.git
synced 2026-03-11 09:04:36 +00:00
[mv3] Minor code review
This commit is contained in:
parent
39b505a52e
commit
de7a406920
2 changed files with 4 additions and 13 deletions
|
|
@ -464,7 +464,8 @@ async function start() {
|
|||
}
|
||||
|
||||
// Permissions may have been removed while the extension was disabled
|
||||
const permissionsChanged = await onPermissionsRemoved();
|
||||
const permissionsChanged = process.wakeupRun === false &&
|
||||
await onPermissionsRemoved();
|
||||
|
||||
// Unsure whether the browser remembers correctly registered css/scripts
|
||||
// after we quit the browser. For now uBOL will check unconditionally at
|
||||
|
|
|
|||
|
|
@ -46,23 +46,13 @@ export const process = {
|
|||
export async function loadRulesetConfig() {
|
||||
const sessionData = await sessionRead('rulesetConfig');
|
||||
if ( sessionData ) {
|
||||
rulesetConfig.version = sessionData.version;
|
||||
rulesetConfig.enabledRulesets = sessionData.enabledRulesets;
|
||||
rulesetConfig.autoReload = sessionData.autoReload ?? true;
|
||||
rulesetConfig.showBlockedCount = sessionData.showBlockedCount ?? true;
|
||||
rulesetConfig.strictBlockMode = sessionData.strictBlockMode ?? true;
|
||||
rulesetConfig.developerMode = sessionData.developerMode ?? false;
|
||||
Object.assign(rulesetConfig, sessionData)
|
||||
process.wakeupRun = true;
|
||||
return;
|
||||
}
|
||||
const localData = await localRead('rulesetConfig');
|
||||
if ( localData ) {
|
||||
rulesetConfig.version = localData.version;
|
||||
rulesetConfig.enabledRulesets = localData.enabledRulesets;
|
||||
rulesetConfig.autoReload = localData.autoReload ?? true;
|
||||
rulesetConfig.showBlockedCount = localData.showBlockedCount ?? true;
|
||||
rulesetConfig.strictBlockMode = localData.strictBlockMode ?? true;
|
||||
rulesetConfig.developerMode = localData.developerMode ?? false;
|
||||
Object.assign(rulesetConfig, localData)
|
||||
sessionWrite('rulesetConfig', rulesetConfig);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue