Left: | ||
Right: |
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-present eyeo GmbH | 3 * Copyright (C) 2006-present 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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
16 */ | 16 */ |
17 | 17 |
18 /* globals checkShareResource, getDocLink, i18nFormatDateTime, openSharePopup, | 18 /* globals checkShareResource, getDocLink, i18nFormatDateTime, openSharePopup, |
19 setLinks, E */ | 19 require, setLinks, E */ |
20 | 20 |
21 "use strict"; | 21 "use strict"; |
22 | 22 |
23 require("../css/desktop-options.css"); | |
Thomas Greiner
2018/02/27 13:59:21
We already declare it in desktop-options.html so w
a.giammarchi
2018/02/27 14:19:36
look closer :-)
what we ship is skin/desktop-opti
Thomas Greiner
2018/02/27 19:41:54
The problem I see is that this approach requires u
a.giammarchi
2018/02/28 08:10:18
1 and 2 are already there, those are the bundled v
Thomas Greiner
2018/02/28 12:23:14
That's true. I wrongly assumed it was part of your
a.giammarchi
2018/02/28 13:01:03
it's for components. Components have related CSS.
Thomas Greiner
2018/03/07 13:10:21
Of course they're not independent but this `requir
| |
24 | |
23 let subscriptionsMap = Object.create(null); | 25 let subscriptionsMap = Object.create(null); |
24 let filtersMap = Object.create(null); | 26 let filtersMap = Object.create(null); |
25 let collections = Object.create(null); | 27 let collections = Object.create(null); |
26 let acceptableAdsUrl = null; | 28 let acceptableAdsUrl = null; |
27 let acceptableAdsPrivacyUrl = null; | 29 let acceptableAdsPrivacyUrl = null; |
28 let isCustomFiltersLoaded = false; | 30 let isCustomFiltersLoaded = false; |
29 let {getMessage} = browser.i18n; | 31 let {getMessage} = browser.i18n; |
30 let {setElementText} = ext.i18n; | 32 let {setElementText} = ext.i18n; |
31 let customFilters = []; | 33 let customFilters = []; |
32 let filterErrors = new Map([ | 34 let filterErrors = new Map([ |
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1465 "ui_warn_tracking"] | 1467 "ui_warn_tracking"] |
1466 }); | 1468 }); |
1467 browser.runtime.sendMessage({ | 1469 browser.runtime.sendMessage({ |
1468 type: "subscriptions.listen", | 1470 type: "subscriptions.listen", |
1469 filter: ["added", "disabled", "homepage", "lastDownload", "removed", | 1471 filter: ["added", "disabled", "homepage", "lastDownload", "removed", |
1470 "title", "downloadStatus", "downloading"] | 1472 "title", "downloadStatus", "downloading"] |
1471 }); | 1473 }); |
1472 | 1474 |
1473 window.addEventListener("DOMContentLoaded", onDOMLoaded, false); | 1475 window.addEventListener("DOMContentLoaded", onDOMLoaded, false); |
1474 window.addEventListener("hashchange", onHashChange, false); | 1476 window.addEventListener("hashchange", onHashChange, false); |
OLD | NEW |