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

Side by Side Diff: include.preload.js

Issue 5225119261655040: Issue 1282 - Don't generate filters conflicting with existing exception rules (Closed)
Patch Set: Rebased and addressed comments Created March 3, 2015, 2:28 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include.postload.js ('k') | lib/filterComposer.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 var SELECTOR_GROUP_SIZE = 20; 18 var SELECTOR_GROUP_SIZE = 20;
19 19
20 var typeMap = { 20 var typeMap = {
21 "img": "IMAGE", 21 "img": "IMAGE",
22 "input": "IMAGE", 22 "input": "IMAGE",
23 "picture": "IMAGE",
23 "audio": "MEDIA", 24 "audio": "MEDIA",
24 "video": "MEDIA", 25 "video": "MEDIA",
25 "frame": "SUBDOCUMENT", 26 "frame": "SUBDOCUMENT",
26 "iframe": "SUBDOCUMENT" 27 "iframe": "SUBDOCUMENT",
28 "object": "OBJECT",
29 "embed": "OBJECT"
27 }; 30 };
28 31
29 function checkCollapse(element) 32 function checkCollapse(element)
30 { 33 {
31 var tag = element.localName; 34 var tag = element.localName;
32 if (tag in typeMap) 35 if (tag in typeMap)
33 { 36 {
34 // This element failed loading, did we block it? 37 // This element failed loading, did we block it?
35 var url = element.src; 38 var url = element.src;
36 if (!url || !/^https?:/i.test(url)) 39 if (!url || !/^https?:/i.test(url))
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 }, true); 266 }, true);
264 267
265 ext.backgroundPage.sendMessage({type: "get-selectors"}, setElemhideCSSRules); 268 ext.backgroundPage.sendMessage({type: "get-selectors"}, setElemhideCSSRules);
266 } 269 }
267 270
268 if (document instanceof HTMLDocument) 271 if (document instanceof HTMLDocument)
269 { 272 {
270 checkSitekey(); 273 checkSitekey();
271 init(document); 274 init(document);
272 } 275 }
OLDNEW
« no previous file with comments | « include.postload.js ('k') | lib/filterComposer.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld