Explorar el Código

fix: allow reset blacklist to empty

Gerald hace 8 años
padre
commit
ad7854030c
Se han modificado 1 ficheros con 5 adiciones y 3 borrados
  1. 5 3
      src/background/utils/tester.js

+ 5 - 3
src/background/utils/tester.js

@@ -4,8 +4,7 @@ import { getOption, hookOptions } from './options';
 const RE = /(.*?):\/\/([^/]*)\/(.*)/;
 let blacklistRules = [];
 hookOptions(changes => {
-  const { blacklist } = changes;
-  if (blacklist) resetBlacklist(blacklist);
+  if ('blacklist' in changes) resetBlacklist(changes.blacklist || '');
 });
 
 /**
@@ -133,7 +132,10 @@ export function testBlacklist(url) {
   }
 }
 export function resetBlacklist(list) {
-  const rules = list || getOption('blacklist');
+  const rules = list == null ? getOption('blacklist') : list;
+  if (process.env.DEBUG) {
+    console.info('Reset blacklist:', rules);
+  }
   // XXX compatible with {Array} list in v2.6.1-
   blacklistRules = (Array.isArray(rules) ? rules : (rules || '').split('\n'))
   .map(line => {