From 67e06f53b4d73df6179f6d320553a55da4ead40e Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Mon, 26 Feb 2018 14:08:16 -0500 Subject: [PATCH] offer concise version of often-used filter options (see https://github.com/NanoAdblocker/NanoCore/blob/master/Notes/FilterIncompatibility.MD#convenience-options) --- src/js/static-net-filtering.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js index bf1da6f63..78dbd2022 100644 --- a/src/js/static-net-filtering.js +++ b/src/js/static-net-filtering.js @@ -1,7 +1,7 @@ /******************************************************************************* uBlock Origin - a browser extension to block requests. - Copyright (C) 2014-2017 Raymond Hill + Copyright (C) 2014-2018 Raymond Hill This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1378,10 +1378,12 @@ var FilterParser = function() { FilterParser.prototype.toNormalizedType = { 'beacon': 'other', + 'css': 'stylesheet', 'data': 'data', 'document': 'main_frame', 'elemhide': 'generichide', 'font': 'font', + 'frame': 'sub_frame', 'genericblock': 'unsupported', 'generichide': 'generichide', 'image': 'image', @@ -1397,6 +1399,7 @@ FilterParser.prototype.toNormalizedType = { 'script': 'script', 'stylesheet': 'stylesheet', 'subdocument': 'sub_frame', + 'xhr': 'xmlhttprequest', 'xmlhttprequest': 'xmlhttprequest', 'webrtc': 'unsupported', 'websocket': 'websocket' @@ -1510,7 +1513,7 @@ FilterParser.prototype.parseOptions = function(s) { if ( not ) { opt = opt.slice(1); } - if ( opt === 'third-party' ) { + if ( opt === 'third-party' || opt === '3p' ) { this.parsePartyOption(false, not); continue; } @@ -1553,7 +1556,7 @@ FilterParser.prototype.parseOptions = function(s) { this.important = Important; continue; } - if ( opt === 'first-party' ) { + if ( opt === 'first-party' || opt === '1p' ) { this.parsePartyOption(true, not); continue; }