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

Delta Between Two Patch Sets: lib/notificationHelper.js

Issue 29374674: Issue 4864 - Start using ESLint for adblockpluschrome (Closed)
Left Patch Set: Fixed typo with shadowRoot getter Created March 14, 2017, 10:28 a.m.
Right Patch Set: Use .includes again Created March 31, 2017, 8:37 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/messaging.js ('k') | lib/popupBlocker.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
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-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
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 *
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // We use the highest priority to prevent the notification 202 // We use the highest priority to prevent the notification
203 // from closing automatically. 203 // from closing automatically.
204 priority: 2 204 priority: 2
205 }); 205 });
206 } 206 }
207 else if ("Notification" in window && activeNotification.type != "question") 207 else if ("Notification" in window && activeNotification.type != "question")
208 { 208 {
209 if (linkCount > 0) 209 if (linkCount > 0)
210 message += " " + ext.i18n.getMessage("notification_without_buttons"); 210 message += " " + ext.i18n.getMessage("notification_without_buttons");
211 211
212 let notif = new Notification( 212 let widget = new Notification(
Wladimir Palant 2017/03/14 13:03:28 I understand that the point here is to avoid maski
kzar 2017/03/15 04:57:51 Done.
213 title, 213 title,
214 { 214 {
215 lang: Utils.appLocale, 215 lang: Utils.appLocale,
216 dir: ext.i18n.getMessage("@@bidi_dir"), 216 dir: ext.i18n.getMessage("@@bidi_dir"),
217 body: message, 217 body: message,
218 icon: iconUrl 218 icon: iconUrl
219 } 219 }
220 ); 220 );
221 221
222 notif.addEventListener("click", openNotificationLinks); 222 widget.addEventListener("click", openNotificationLinks);
223 notif.addEventListener("close", notificationClosed); 223 widget.addEventListener("close", notificationClosed);
224 } 224 }
225 else 225 else
226 { 226 {
227 message = title + "\n" + message; 227 message = title + "\n" + message;
228 if (linkCount > 0) 228 if (linkCount > 0)
229 message += "\n\n" + ext.i18n.getMessage("notification_with_buttons"); 229 message += "\n\n" + ext.i18n.getMessage("notification_with_buttons");
230 230
231 let approved = confirm(message); 231 let approved = confirm(message);
232 if (activeNotification.type == "question") 232 if (activeNotification.type == "question")
233 notificationButtonClick(approved ? 0 : 1); 233 notificationButtonClick(approved ? 0 : 1);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 let methods = displayMethods[notificationType] || defaultDisplayMethods; 272 let methods = displayMethods[notificationType] || defaultDisplayMethods;
273 return methods.indexOf(method) > -1; 273 return methods.indexOf(method) > -1;
274 }; 274 };
275 275
276 ext.pages.onLoading.addListener(page => 276 ext.pages.onLoading.addListener(page =>
277 { 277 {
278 NotificationStorage.showNext(stringifyURL(page.url)); 278 NotificationStorage.showNext(stringifyURL(page.url));
279 }); 279 });
280 280
281 NotificationStorage.addShowListener(showNotification); 281 NotificationStorage.addShowListener(showNotification);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld