Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/filterComposer.js

Issue 29991594: Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702 (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Created Jan. 29, 2019, 4:36 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 /** @module filterComposer */ 18 /** @module filterComposer */
19 19
20 "use strict"; 20 "use strict";
21 21
22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); 22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
23 const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); 23 const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
24 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier"); 24 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
25 const {isThirdParty} = require("../adblockpluscore/lib/domain");
25 const {Prefs} = require("./prefs"); 26 const {Prefs} = require("./prefs");
26 const {extractHostFromFrame, isThirdParty} = require("./url"); 27 const {extractHostFromFrame} = require("./url");
27 const {getKey, checkWhitelisted} = require("./whitelisting"); 28 const {getKey, checkWhitelisted} = require("./whitelisting");
28 const {port} = require("./messaging"); 29 const {port} = require("./messaging");
29 const info = require("info"); 30 const info = require("info");
30 31
31 function isValidString(s) 32 function isValidString(s)
32 { 33 {
33 return s && s.indexOf("\0") == -1; 34 return s && s.indexOf("\0") == -1;
34 } 35 }
35 36
36 function escapeChar(chr) 37 function escapeChar(chr)
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 port.on("composer.isPageReady", (message, sender) => 365 port.on("composer.isPageReady", (message, sender) =>
365 { 366 {
366 return readyActivePages.has(new ext.Page({id: message.pageId})); 367 return readyActivePages.has(new ext.Page({id: message.pageId}));
367 }); 368 });
368 369
369 port.on("composer.ready", (message, sender) => 370 port.on("composer.ready", (message, sender) =>
370 { 371 {
371 readyActivePages.set(sender.page, !checkWhitelisted(sender.page)); 372 readyActivePages.set(sender.page, !checkWhitelisted(sender.page));
372 updateContextMenu(sender.page); 373 updateContextMenu(sender.page);
373 }); 374 });
OLDNEW

Powered by Google App Engine
This is Rietveld