| OLD | NEW | 
|    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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  266  |  266  | 
|  267   if (parsed.canSafelyMatchAsLowercase || filter.matchCase) |  267   if (parsed.canSafelyMatchAsLowercase || filter.matchCase) | 
|  268     trigger["url-filter-is-case-sensitive"] = true; |  268     trigger["url-filter-is-case-sensitive"] = true; | 
|  269  |  269  | 
|  270   let included = []; |  270   let included = []; | 
|  271   let excluded = []; |  271   let excluded = []; | 
|  272  |  272  | 
|  273   parseDomains(filter.domains, included, excluded); |  273   parseDomains(filter.domains, included, excluded); | 
|  274  |  274  | 
|  275   if (withResourceTypes) |  275   if (withResourceTypes) | 
 |  276   { | 
|  276     trigger["resource-type"] = getResourceTypes(filter); |  277     trigger["resource-type"] = getResourceTypes(filter); | 
 |  278  | 
 |  279     if (trigger["resource-type"].length == 0) | 
 |  280       return; | 
 |  281   } | 
 |  282  | 
|  277   if (filter.thirdParty != null) |  283   if (filter.thirdParty != null) | 
|  278     trigger["load-type"] = [filter.thirdParty ? "third-party" : "first-party"]; |  284     trigger["load-type"] = [filter.thirdParty ? "third-party" : "first-party"]; | 
|  279  |  285  | 
|  280   if (included.length > 0) |  286   if (included.length > 0) | 
|  281     trigger["if-domain"] = addDomainPrefix(included); |  287     trigger["if-domain"] = addDomainPrefix(included); | 
|  282   else if (excluded.length > 0) |  288   else if (excluded.length > 0) | 
|  283     trigger["unless-domain"] = addDomainPrefix(excluded); |  289     trigger["unless-domain"] = addDomainPrefix(excluded); | 
|  284  |  290  | 
|  285   rules.push({trigger: trigger, action: {type: action}}); |  291   rules.push({trigger: trigger, action: {type: action}}); | 
|  286 } |  292 } | 
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  461  |  467  | 
|  462   for (let filter of this.elemhideExceptions) |  468   for (let filter of this.elemhideExceptions) | 
|  463     convertFilterAddRules(rules, filter, "ignore-previous-rules", false); |  469     convertFilterAddRules(rules, filter, "ignore-previous-rules", false); | 
|  464   for (let filter of this.requestFilters) |  470   for (let filter of this.requestFilters) | 
|  465     convertFilterAddRules(rules, filter, "block", true); |  471     convertFilterAddRules(rules, filter, "block", true); | 
|  466   for (let filter of this.requestExceptions) |  472   for (let filter of this.requestExceptions) | 
|  467     convertFilterAddRules(rules, filter, "ignore-previous-rules", true); |  473     convertFilterAddRules(rules, filter, "ignore-previous-rules", true); | 
|  468  |  474  | 
|  469   return rules.filter(rule => !hasNonASCI(rule)); |  475   return rules.filter(rule => !hasNonASCI(rule)); | 
|  470 }; |  476 }; | 
| OLD | NEW |