| 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-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 |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 { | 168 { |
| 169 | 169 |
| 170 if (params.filterError) | 170 if (params.filterError) |
| 171 return {error: "Invalid filter"}; | 171 return {error: "Invalid filter"}; |
| 172 return {filter: modules.filterClasses.Filter.fromText(text)}; | 172 return {filter: modules.filterClasses.Filter.fromText(text)}; |
| 173 }, | 173 }, |
| 174 parseFilters: function(text) | 174 parseFilters: function(text) |
| 175 { | 175 { |
| 176 if (params.filterError) | 176 if (params.filterError) |
| 177 return {errors: ["Invalid filter"]}; | 177 return {errors: ["Invalid filter"]}; |
| 178 return {filters: | 178 return { |
| 179 text.split("\n").map(modules.filterClasses.Filter.fromText)}; | 179 filters: text.split("\n").map(modules.filterClasses.Filter.fromText), |
| 180 errors: [] |
| 181 }; |
| 180 } | 182 } |
| 181 }; | 183 }; |
| 182 | 184 |
| 183 modules.synchronizer = { | 185 modules.synchronizer = { |
| 184 Synchronizer: {} | 186 Synchronizer: {} |
| 185 }; | 187 }; |
| 186 | 188 |
| 187 modules.matcher = { | 189 modules.matcher = { |
| 188 defaultMatcher: { | 190 defaultMatcher: { |
| 189 matchesAny: function(url, requestType, docDomain, thirdParty) | 191 matchesAny: function(url, requestType, docDomain, thirdParty) |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 type: "message", | 292 type: "message", |
| 291 payload: { | 293 payload: { |
| 292 title: "Custom subscription", | 294 title: "Custom subscription", |
| 293 url: "http://example.com/custom.txt", | 295 url: "http://example.com/custom.txt", |
| 294 type: "add-subscription" | 296 type: "add-subscription" |
| 295 } | 297 } |
| 296 }, "*"); | 298 }, "*"); |
| 297 }, 1000); | 299 }, 1000); |
| 298 } | 300 } |
| 299 })(this); | 301 })(this); |
| OLD | NEW |