Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: lib/uninstall.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Left Patch Set: Created Jan. 13, 2017, 12:11 p.m.
Right Patch Set: Addressed some more feedback Created Jan. 18, 2017, 11:44 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « lib/tldjs.js ('k') | lib/url.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
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
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 /** @module uninstall */ 18 /** @module uninstall */
19 19
20 let info = require("info"); 20 "use strict";
21 let {Prefs} = require("prefs"); 21
22 let {Utils} = require("utils"); 22 const info = require("info");
23 const {Prefs} = require("prefs");
24 const {Utils} = require("utils");
23 25
24 function setUninstallURL() 26 function setUninstallURL()
25 { 27 {
26 let search = []; 28 let search = [];
27 let keys = ["addonName", "addonVersion", "application", "applicationVersion", 29 for (let key of ["addonName", "addonVersion", "application",
28 "platform", "platformVersion"]; 30 "applicationVersion", "platform", "platformVersion"])
29 for (let key of keys)
30 search.push(key + "=" + encodeURIComponent(info[key])); 31 search.push(key + "=" + encodeURIComponent(info[key]));
31 32
32 let downlCount = Prefs.notificationdata.downloadCount || 0; 33 let downlCount = Prefs.notificationdata.downloadCount || 0;
33 34
34 if (downlCount > 4) 35 if (downlCount > 4)
35 { 36 {
36 if (downlCount < 8) 37 if (downlCount < 8)
37 downlCount = "5-7"; 38 downlCount = "5-7";
38 else if (downlCount < 30) 39 else if (downlCount < 30)
39 downlCount = "8-29"; 40 downlCount = "8-29";
(...skipping 12 matching lines...) Expand all
52 } 53 }
53 54
54 // The uninstall URL contains the notification download count as a parameter, 55 // The uninstall URL contains the notification download count as a parameter,
55 // therefore we must wait for preferences to be loaded before generating the 56 // therefore we must wait for preferences to be loaded before generating the
56 // URL and we need to re-generate it each time the notification data changes. 57 // URL and we need to re-generate it each time the notification data changes.
57 if ("setUninstallURL" in chrome.runtime) 58 if ("setUninstallURL" in chrome.runtime)
58 { 59 {
59 Prefs.untilLoaded.then(setUninstallURL); 60 Prefs.untilLoaded.then(setUninstallURL);
60 Prefs.on("notificationdata", setUninstallURL); 61 Prefs.on("notificationdata", setUninstallURL);
61 } 62 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld