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

Delta Between Two Patch Sets: background.js

Issue 29374674: Issue 4864 - Start using ESLint for adblockpluschrome (Closed)
Left Patch Set: Fixed typo with shadowRoot getter Created March 14, 2017, 10:28 a.m.
Right Patch Set: Use .includes again Created March 31, 2017, 8:37 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « README.md ('k') | chrome/devtools.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2017 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 *
(...skipping 20 matching lines...) Expand all
34 RegExpFilter.typeMap.ELEMHIDE)) 34 RegExpFilter.typeMap.ELEMHIDE))
35 { 35 {
36 let specificOnly = checkWhitelisted(sender.page, sender.frame, 36 let specificOnly = checkWhitelisted(sender.page, sender.frame,
37 RegExpFilter.typeMap.GENERICHIDE); 37 RegExpFilter.typeMap.GENERICHIDE);
38 selectors = ElemHide.getSelectorsForDomain( 38 selectors = ElemHide.getSelectorsForDomain(
39 extractHostFromFrame(sender.frame), 39 extractHostFromFrame(sender.frame),
40 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING 40 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING
41 ); 41 );
42 } 42 }
43 else 43 else
44 {
44 selectors = []; 45 selectors = [];
46 }
45 47
46 return {selectors, trace}; 48 return {selectors, trace};
47 }); 49 });
48 50
49 port.on("forward", (msg, sender) => 51 port.on("forward", (msg, sender) =>
50 { 52 {
51 let targetPage; 53 let targetPage;
52 if (msg.targetPageId) 54 if (msg.targetPageId)
53 targetPage = ext.getPage(msg.targetPageId); 55 targetPage = ext.getPage(msg.targetPageId);
54 else 56 else
55 targetPage = sender.page; 57 targetPage = sender.page;
56 58
57 if (targetPage) 59 if (targetPage)
58 { 60 {
59 msg.payload.sender = sender.page.id; 61 msg.payload.sender = sender.page.id;
60 if (msg.expectsResponse) 62 if (msg.expectsResponse)
61 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); 63 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload));
62 targetPage.sendMessage(msg.payload); 64 targetPage.sendMessage(msg.payload);
63 } 65 }
64 }); 66 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld