diff --git a/src/js/background.js b/src/js/background.js index 61350e1a7..f28b5f3a4 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -93,7 +93,7 @@ return { // read-only systemSettings: { - compiledMagic: 'xtsldiywhvgc', + compiledMagic: 'ythmhjvufkkq', selfieMagic: 'xtsldiywhvgc' }, diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js index 4915691bf..767648b27 100644 --- a/src/js/logger-ui.js +++ b/src/js/logger-ui.js @@ -92,7 +92,7 @@ var uglyRequestTypes = { }; var staticFilterTypes = { - 'doc': 'other', + 'doc': 'document', 'css': 'stylesheet', 'frame': 'subdocument', 'xhr': 'xmlhttprequest' @@ -171,7 +171,9 @@ var filterDecompiler = (function() { 5: 'xmlhttprequest', 6: 'subdocument', 7: 'font', - 8: 'other', + 8: 'media', + 9: 'websocket', + 10: 'other', 11: 'popunder', 12: 'document', 13: 'elemhide', diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js index 24b130278..89dc895a2 100644 --- a/src/js/static-net-filtering.js +++ b/src/js/static-net-filtering.js @@ -62,7 +62,9 @@ var typeNameToTypeValue = { 'xmlhttprequest': 5 << 4, 'sub_frame': 6 << 4, 'font': 7 << 4, - 'other': 8 << 4, + 'media': 8 << 4, + 'websocket': 9 << 4, + 'other': 10 << 4, 'popunder': 11 << 4, 'main_frame': 12 << 4, 'cosmetic-filtering': 13 << 4, @@ -79,7 +81,9 @@ var typeValueToTypeName = { 5: 'xmlhttprequest', 6: 'subdocument', 7: 'font', - 8: 'other', + 8: 'media', + 9: 'websocket', + 10: 'other', 11: 'popunder', 12: 'document', 13: 'cosmetic-filtering', @@ -1307,6 +1311,8 @@ FilterParser.prototype.toNormalizedType = { 'xmlhttprequest': 'xmlhttprequest', 'subdocument': 'sub_frame', 'font': 'font', + 'media': 'media', + 'websocket': 'websocket', 'other': 'other', 'popunder': 'popunder', 'document': 'main_frame',