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

Side by Side Diff: lib/uninstall.js

Issue 29333533: Issue 3515 - Replace Prefs.onLoaded event by Prefs.isLoaded promise (Closed)
Patch Set: Created Jan. 14, 2016, 5:29 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « lib/prefs.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 for (let key of keys) 29 for (let key of keys)
30 search.push(key + "=" + encodeURIComponent(info[key])); 30 search.push(key + "=" + encodeURIComponent(info[key]));
31 31
32 let downlCount = Prefs.notificationdata.downloadCount || 0; 32 let downlCount = Prefs.notificationdata.downloadCount || 0;
33 search.push("notificationDownloadCount=" + encodeURIComponent(downlCount)); 33 search.push("notificationDownloadCount=" + encodeURIComponent(downlCount));
34 34
35 chrome.runtime.setUninstallURL(Utils.getDocLink("uninstalled") + "&" + 35 chrome.runtime.setUninstallURL(Utils.getDocLink("uninstalled") + "&" +
36 search.join("&")); 36 search.join("&"));
37 } 37 }
38 38
39 function onPrefsLoaded()
40 {
41 Prefs.onLoaded.removeListener(onPrefsLoaded);
42 setUninstallURL();
43 }
44
45 // The uninstall URL contains the notification download count as a parameter, 39 // The uninstall URL contains the notification download count as a parameter,
46 // therefore we must wait for preferences to be loaded before generating the 40 // therefore we must wait for preferences to be loaded before generating the
47 // URL and we need to re-generate it each time the notification data changes. 41 // URL and we need to re-generate it each time the notification data changes.
48 if ("setUninstallURL" in chrome.runtime) 42 if ("setUninstallURL" in chrome.runtime)
49 { 43 {
50 Prefs.onLoaded.addListener(onPrefsLoaded); 44 Prefs.isLoaded.then(setUninstallURL);
51 Prefs.onChanged.addListener(function(name) 45 Prefs.onChanged.addListener(function(name)
52 { 46 {
53 if (name == "notificationdata") 47 if (name == "notificationdata")
54 setUninstallURL(); 48 setUninstallURL();
55 }); 49 });
56 } 50 }
OLDNEW
« no previous file with comments | « lib/prefs.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld