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

Side by Side Diff: lib/elemHideFF.js

Issue 29347299: Issue 4230 - Don't disable element hiding if a generichide exception rule is present (Closed)
Patch Set: Created July 6, 2016, 1:56 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 | « no previous file | no next file » | 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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 port.on("elemhideEnabled", ({frames, isPrivate}) => 44 port.on("elemhideEnabled", ({frames, isPrivate}) =>
45 { 45 {
46 if (!Prefs.enabled) 46 if (!Prefs.enabled)
47 return {enabled: false}; 47 return {enabled: false};
48 48
49 let hit = Policy.isFrameWhitelisted(frames, true); 49 let hit = Policy.isFrameWhitelisted(frames, true);
50 if (hit) 50 if (hit)
51 { 51 {
52 let [frameIndex, contentType, docDomain, thirdParty, location, filter] = hit ; 52 let [frameIndex, contentType, docDomain, thirdParty, location, filter] = hit ;
53 if (!isPrivate) 53 if (contentType != "GENERICHIDE")
54 FilterStorage.increaseHitCount(filter); 54 {
55 return { 55 if (!isPrivate)
56 enabled: false, 56 FilterStorage.increaseHitCount(filter);
57 contentType, docDomain, thirdParty, location, 57 return {
58 filter: filter.text, filterType: filter.type 58 enabled: false,
59 }; 59 contentType, docDomain, thirdParty, location,
60 filter: filter.text, filterType: filter.type
61 };
62 }
60 } 63 }
61 else 64
62 return {enabled: true}; 65 return {enabled: true};
63 }); 66 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld