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 "use strict"; | 18 "use strict"; |
19 | 19 |
20 /** | 20 /** |
21 * @fileOverview Handles notifications. | 21 * @fileOverview Handles notifications. |
22 */ | 22 */ |
23 | 23 |
24 const {Prefs} = require("prefs"); | 24 const {Prefs} = require("prefs"); |
kzar
2017/10/18 15:12:07
You missed this one.
hub
2017/10/18 17:57:45
same. out of tree module.
| |
25 const {Downloader, Downloadable, | 25 const {Downloader, Downloadable, |
26 MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader"); | 26 MILLIS_IN_MINUTE, MILLIS_IN_HOUR, |
27 MILLIS_IN_DAY} = require("./downloader"); | |
27 const {Utils} = require("utils"); | 28 const {Utils} = require("utils"); |
28 const {Matcher, defaultMatcher} = require("matcher"); | 29 const {Matcher, defaultMatcher} = require("./matcher"); |
29 const {Filter, RegExpFilter, WhitelistFilter} = require("filterClasses"); | 30 const {Filter, RegExpFilter, WhitelistFilter} = require("./filterClasses"); |
30 | 31 |
31 const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE; | 32 const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE; |
32 const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR; | 33 const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR; |
33 const EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY; | 34 const EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY; |
34 const TYPE = { | 35 const TYPE = { |
35 information: 0, | 36 information: 0, |
36 question: 1, | 37 question: 1, |
37 relentless: 2, | 38 relentless: 2, |
38 critical: 3 | 39 critical: 3 |
39 }; | 40 }; |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
237 Prefs.notificationdata.data.notifications instanceof Array) | 238 Prefs.notificationdata.data.notifications instanceof Array) |
238 { | 239 { |
239 remoteData = Prefs.notificationdata.data.notifications; | 240 remoteData = Prefs.notificationdata.data.notifications; |
240 } | 241 } |
241 | 242 |
242 let notifications = localData.concat(remoteData); | 243 let notifications = localData.concat(remoteData); |
243 if (notifications.length === 0) | 244 if (notifications.length === 0) |
244 return null; | 245 return null; |
245 | 246 |
246 const {addonName, addonVersion, application, | 247 const {addonName, addonVersion, application, |
247 applicationVersion, platform, platformVersion} = require("info"); | 248 applicationVersion, platform, platformVersion} = require("info"); |
kzar
2017/10/18 15:12:07
This one should be "../../buildtools/info" I think
hub
2017/10/18 17:57:45
out of tree module.
| |
248 | 249 |
249 let targetChecks = { | 250 let targetChecks = { |
250 extension: v => v == addonName, | 251 extension: v => v == addonName, |
251 extensionMinVersion: | 252 extensionMinVersion: |
252 v => compareVersion(addonVersion, v) >= 0, | 253 v => compareVersion(addonVersion, v) >= 0, |
253 extensionMaxVersion: | 254 extensionMaxVersion: |
254 v => compareVersion(addonVersion, v) <= 0, | 255 v => compareVersion(addonVersion, v) <= 0, |
255 application: v => v == application, | 256 application: v => v == application, |
256 applicationMinVersion: | 257 applicationMinVersion: |
257 v => compareVersion(applicationVersion, v) >= 0, | 258 v => compareVersion(applicationVersion, v) >= 0, |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
513 else if (index != -1 && forceValue !== true) | 514 else if (index != -1 && forceValue !== true) |
514 categories.splice(index, 1); | 515 categories.splice(index, 1); |
515 | 516 |
516 // HACK: JSON values aren't saved unless they are assigned a | 517 // HACK: JSON values aren't saved unless they are assigned a |
517 // different object. | 518 // different object. |
518 Prefs.notifications_ignoredcategories = | 519 Prefs.notifications_ignoredcategories = |
519 JSON.parse(JSON.stringify(categories)); | 520 JSON.parse(JSON.stringify(categories)); |
520 } | 521 } |
521 }; | 522 }; |
522 Notification.init(); | 523 Notification.init(); |
OLD | NEW |