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

Side by Side Diff: chrome/content/ui/sidebar.js

Issue 29364102: Issue 4658 - Incorporate element hiding emulation filters (Closed) Base URL: https://bitbucket.org/fhd/adblockplus
Patch Set: Improve error message some more Created Dec. 13, 2016, 5:06 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 | « chrome/content/ui/filters-filterview.js ('k') | chrome/content/ui/utils.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-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 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 if (filter) 994 if (filter)
995 list.push("filter-disabled-" + filter.disabled); 995 list.push("filter-disabled-" + filter.disabled);
996 996
997 state = "state-regular"; 997 state = "state-regular";
998 if (filter && !filter.disabled) 998 if (filter && !filter.disabled)
999 { 999 {
1000 if (filter instanceof WhitelistFilter) 1000 if (filter instanceof WhitelistFilter)
1001 state = "state-whitelisted"; 1001 state = "state-whitelisted";
1002 else if (filter instanceof BlockingFilter) 1002 else if (filter instanceof BlockingFilter)
1003 state = "state-filtered"; 1003 state = "state-filtered";
1004 else if (filter instanceof ElemHideFilter || filter instanceof CSSProper tyFilter) 1004 else if (filter instanceof ElemHideFilter || filter instanceof ElemHideE mulationFilter)
1005 state = "state-hidden"; 1005 state = "state-hidden";
1006 else if (filter instanceof ElemHideException) 1006 else if (filter instanceof ElemHideException)
1007 state = "state-hiddenexception"; 1007 state = "state-hiddenexception";
1008 } 1008 }
1009 } 1009 }
1010 else { 1010 else {
1011 list.push("dummy-true"); 1011 list.push("dummy-true");
1012 1012
1013 state = "state-filtered"; 1013 state = "state-filtered";
1014 if (this.data && Policy.isWhitelisted(contentLocation)) 1014 if (this.data && Policy.isWhitelisted(contentLocation))
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 return {tooltip: this.itemsDummyTooltip}; 1328 return {tooltip: this.itemsDummyTooltip};
1329 }, 1329 },
1330 1330
1331 invalidateItem: function(item) 1331 invalidateItem: function(item)
1332 { 1332 {
1333 let row = this.data.indexOf(item); 1333 let row = this.data.indexOf(item);
1334 if (row >= 0) 1334 if (row >= 0)
1335 this.boxObject.invalidateRow(row); 1335 this.boxObject.invalidateRow(row);
1336 } 1336 }
1337 } 1337 }
OLDNEW
« no previous file with comments | « chrome/content/ui/filters-filterview.js ('k') | chrome/content/ui/utils.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld