| Index: lib/devtools.js |
| =================================================================== |
| --- a/lib/devtools.js |
| +++ b/lib/devtools.js |
| @@ -12,19 +12,18 @@ |
| * GNU General Public License for more details. |
| * |
| * You should have received a copy of the GNU General Public License |
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| "use strict"; |
| -const {RegExpFilter, |
| - WhitelistFilter, |
| - ElemHideFilter} = require("filterClasses"); |
| +const {RegExpFilter, WhitelistFilter, ElemHideFilter} = |
| + require("filterClasses"); |
| const {SpecialSubscription} = require("subscriptionClasses"); |
| const {FilterStorage} = require("filterStorage"); |
| const {defaultMatcher} = require("matcher"); |
| const {FilterNotifier} = require("filterNotifier"); |
| const {extractHostFromFrame} = require("url"); |
| const {port} = require("messaging"); |
| const nonRequestTypes = ["DOCUMENT", "ELEMHIDE", "GENERICBLOCK", "GENERICHIDE"]; |
| @@ -77,19 +76,21 @@ |
| function hasRecord(panel, request, filter) |
| { |
| return panel.records.some(record => |
| record.request.url == request.url && |
| record.request.docDomain == request.docDomain && |
| // Ignore partial (e.g. ELEMHIDE) whitelisting if there is already |
| // a DOCUMENT exception which disables all means of blocking. |
| - (record.request.type == "DOCUMENT" ? |
| - nonRequestTypes.includes(request.type) : |
| - record.request.type == request.type) && |
| + ( |
|
Manish Jethani
2017/07/21 09:28:40
Reported a bug for this:
https://github.com/eslin
|
| + record.request.type == "DOCUMENT" ? |
| + nonRequestTypes.includes(request.type) : |
| + record.request.type == request.type |
| + ) && |
| // Matched element hiding filters don't relate to a particular request, |
| // so we have to compare the selector in order to avoid duplicates. |
| (record.filter && record.filter.selector) == (filter && filter.selector) |
| ); |
| } |
| function addRecord(panel, request, filter) |