| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 ElemHide.isDirty = true; | 177 ElemHide.isDirty = true; |
| 178 } | 178 } |
| 179 }, | 179 }, |
| 180 | 180 |
| 181 /** | 181 /** |
| 182 * Checks whether an exception rule is registered for a filter on a particular | 182 * Checks whether an exception rule is registered for a filter on a particular |
| 183 * domain. | 183 * domain. |
| 184 */ | 184 */ |
| 185 getException: function(/**Filter*/ filter, /**String*/ docDomain) /**ElemHideE
xception*/ | 185 getException: function(/**Filter*/ filter, /**String*/ docDomain) /**ElemHideE
xception*/ |
| 186 { | 186 { |
| 187 let selector = filter.selector; | |
| 188 if (!(filter.selector in exceptions)) | 187 if (!(filter.selector in exceptions)) |
| 189 return null; | 188 return null; |
| 190 | 189 |
| 191 let list = exceptions[filter.selector]; | 190 let list = exceptions[filter.selector]; |
| 192 for (let i = list.length - 1; i >= 0; i--) | 191 for (let i = list.length - 1; i >= 0; i--) |
| 193 if (list[i].isActiveOnDomain(docDomain)) | 192 if (list[i].isActiveOnDomain(docDomain)) |
| 194 return list[i]; | 193 return list[i]; |
| 195 | 194 |
| 196 return null; | 195 return null; |
| 197 }, | 196 }, |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 | 409 |
| 411 if (specificOnly && (!domains || domains[""])) | 410 if (specificOnly && (!domains || domains[""])) |
| 412 continue; | 411 continue; |
| 413 | 412 |
| 414 if (filter.isActiveOnDomain(domain) && !this.getException(filter, domain)) | 413 if (filter.isActiveOnDomain(domain) && !this.getException(filter, domain)) |
| 415 result.push(filter.selector); | 414 result.push(filter.selector); |
| 416 } | 415 } |
| 417 return result; | 416 return result; |
| 418 } | 417 } |
| 419 }; | 418 }; |
| OLD | NEW |