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

Side by Side Diff: lib/notificationHelper.js

Issue 5000038044401664: Issue 2656 - Fixed notification shown in popup (Closed)
Patch Set: Considered active notification being nullable in documentation Created June 6, 2015, 9:51 a.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 | « no previous file | notification.js » ('j') | 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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 let approved = confirm(message); 219 let approved = confirm(message);
220 if (activeNotification.type == "question") 220 if (activeNotification.type == "question")
221 notificationButtonClick(approved ? 0 : 1); 221 notificationButtonClick(approved ? 0 : 1);
222 else if (approved) 222 else if (approved)
223 openNotificationLinks(); 223 openNotificationLinks();
224 } 224 }
225 } 225 }
226 prepareNotificationIconAndPopup(); 226 prepareNotificationIconAndPopup();
227 }; 227 };
228 228
229 /**
230 * Gets the active notification to be shown if any.
231 *
232 * @return {?object}
233 */
234 exports.getActiveNotification = function()
235 {
236 return activeNotification;
237 };
238
229 setTimeout(showNextNotification, 3 * 60 * 1000); 239 setTimeout(showNextNotification, 3 * 60 * 1000);
OLDNEW
« no previous file with comments | « no previous file | notification.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld