diff --git a/js/background.js b/js/background.js index c992cb019..9bfa896cc 100644 --- a/js/background.js +++ b/js/background.js @@ -89,7 +89,7 @@ return { firstUpdateAfter: 5 * oneMinute, nextUpdateAfter: 7 * oneHour, - selfieMagic: 'hdnliuyxkoeg', + selfieMagic: 'tgfnfcmhdqls', selfieAfter: 7 * oneMinute, pageStores: {}, diff --git a/js/net-filtering.js b/js/net-filtering.js index d11f7f12b..469db1585 100644 --- a/js/net-filtering.js +++ b/js/net-filtering.js @@ -53,6 +53,19 @@ const FirstParty = 1 << 2; const ThirdParty = 2 << 2; const SpecificParty = 3 << 2; +var typeNameToTypeValue = { + 'any': 1 << 4, + 'stylesheet': 2 << 4, + 'image': 3 << 4, + 'object': 4 << 4, + 'script': 5 << 4, + 'xmlhttprequest': 6 << 4, + 'sub_frame': 7 << 4, + 'other': 8 << 4, + 'popup': 9 << 4 +}; +const AnyType = typeNameToTypeValue['any']; + const BlockAnyTypeAnyParty = BlockAction | AnyType | AnyParty; const BlockAnyType1stParty = BlockAction | AnyType | FirstParty; const BlockAnyType3rdParty = BlockAction | AnyType | ThirdParty; @@ -69,19 +82,6 @@ const AllowAnyType = AllowAction | AnyType; const AllowAnyParty = AllowAction | AnyParty; const AllowOneParty = AllowAction | SpecificParty; -const AnyType = 1 << 4; - -var typeNameToTypeValue = { - 'stylesheet': 2 << 4, - 'image': 3 << 4, - 'object': 4 << 4, - 'script': 5 << 4, - 'xmlhttprequest': 6 << 4, - 'sub_frame': 7 << 4, - 'other': 8 << 4, - 'popup': 9 << 4 -}; - var pageHostname = ''; var reIgnoreEmpty = /^\s+$/;