| 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-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 } | 95 } |
| 96 } | 96 } |
| 97 }; | 97 }; |
| 98 | 98 |
| 99 modules.prefs = {Prefs: new EventEmitter()}; | 99 modules.prefs = {Prefs: new EventEmitter()}; |
| 100 let prefs = { | 100 let prefs = { |
| 101 notifications_ignoredcategories: (params.showNotificationUI) ? ["*"] : [], | 101 notifications_ignoredcategories: (params.showNotificationUI) ? ["*"] : [], |
| 102 notifications_showui: params.showNotificationUI, | 102 notifications_showui: params.showNotificationUI, |
| 103 shouldShowBlockElementMenu: true, | 103 shouldShowBlockElementMenu: true, |
| 104 show_devtools_panel: true, | 104 show_devtools_panel: true, |
| 105 subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exc
eptionrules.txt" | 105 subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exc
eptionrules.txt", |
| 106 subscriptions_exceptionsurl_privacy: "https://easylist-downloads.adblockplus
.org/exceptionrules-privacy.txt" |
| 106 }; | 107 }; |
| 107 for (let key of Object.keys(prefs)) | 108 for (let key of Object.keys(prefs)) |
| 108 { | 109 { |
| 109 Object.defineProperty(modules.prefs.Prefs, key, { | 110 Object.defineProperty(modules.prefs.Prefs, key, { |
| 110 get() | 111 get() |
| 111 { | 112 { |
| 112 return prefs[key]; | 113 return prefs[key]; |
| 113 }, | 114 }, |
| 114 set(value) | 115 set(value) |
| 115 { | 116 { |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 "###ad-bereich1-superbanner", | 436 "###ad-bereich1-superbanner", |
| 436 "###ad-bereich2-08", | 437 "###ad-bereich2-08", |
| 437 "###ad-bereich2-skyscrapper" | 438 "###ad-bereich2-skyscrapper" |
| 438 ]; | 439 ]; |
| 439 let knownFilters = filters.map(modules.filterClasses.Filter.fromText); | 440 let knownFilters = filters.map(modules.filterClasses.Filter.fromText); |
| 440 | 441 |
| 441 let subscriptions = [ | 442 let subscriptions = [ |
| 442 "https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt", | 443 "https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt", |
| 443 "https://easylist-downloads.adblockplus.org/exceptionrules.txt", | 444 "https://easylist-downloads.adblockplus.org/exceptionrules.txt", |
| 444 "https://easylist-downloads.adblockplus.org/fanboy-social.txt", | 445 "https://easylist-downloads.adblockplus.org/fanboy-social.txt", |
| 446 "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt", |
| 445 "~user~786254" | 447 "~user~786254" |
| 446 ]; | 448 ]; |
| 447 let knownSubscriptions = Object.create(null); | 449 let knownSubscriptions = Object.create(null); |
| 448 for (let subscriptionUrl of subscriptions) | 450 for (let subscriptionUrl of subscriptions) |
| 449 { | 451 { |
| 450 knownSubscriptions[subscriptionUrl] = | 452 knownSubscriptions[subscriptionUrl] = |
| 451 modules.subscriptionClasses.Subscription.fromURL(subscriptionUrl); | 453 modules.subscriptionClasses.Subscription.fromURL(subscriptionUrl); |
| 452 } | 454 } |
| 453 let customSubscription = knownSubscriptions["~user~786254"]; | 455 let customSubscription = knownSubscriptions["~user~786254"]; |
| 454 | 456 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 }, | 542 }, |
| 541 filter: { | 543 filter: { |
| 542 text: "||example.com/some-annoying-popup$popup", | 544 text: "||example.com/some-annoying-popup$popup", |
| 543 whitelisted: false, | 545 whitelisted: false, |
| 544 userDefined: true, | 546 userDefined: true, |
| 545 subscription: null | 547 subscription: null |
| 546 } | 548 } |
| 547 }); | 549 }); |
| 548 }); | 550 }); |
| 549 }()); | 551 }()); |
| OLD | NEW |