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

Delta Between Two Patch Sets: lib/notificationHelper.js

Issue 6063199216467968: Issue 2642 - Moved notifications code to separate module (Closed)
Left Patch Set: Turned showNotification(notification) into showNextNotification([url]) to remove code duplication Created June 4, 2015, 9:34 p.m.
Right Patch Set: Fixed typo in comment Created June 5, 2015, 2:06 p.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 | « background.js ('k') | metadata.common » ('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-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
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 notificationHelper */
19
18 let {startIconAnimation, stopIconAnimation} = require("icon"); 20 let {startIconAnimation, stopIconAnimation} = require("icon");
19 let {Utils} = require("utils"); 21 let {Utils} = require("utils");
20 let {Notification: NotificationStorage} = require("notification"); 22 let {Notification: NotificationStorage} = require("notification");
21 let {stringifyURL} = require("url"); 23 let {stringifyURL} = require("url");
24 let {initAntiAdblockNotification} = require("antiadblockInit");
22 25
23 let activeNotification = null; 26 let activeNotification = null;
24 27
25 // Chrome on Linux does not fully support chrome.notifications until version 35 28 // Chrome on Linux does not fully support chrome.notifications until version 35
26 // https://code.google.com/p/chromium/issues/detail?id=291485 29 // https://code.google.com/p/chromium/issues/detail?id=291485
27 let canUseChromeNotifications = (function() 30 let canUseChromeNotifications = (function()
28 { 31 {
29 let info = require("info"); 32 let info = require("info");
30 if (info.platform == "chromium" && "notifications" in chrome) 33 if (info.platform == "chromium" && "notifications" in chrome)
31 { 34 {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 } 121 }
119 122
120 chrome.notifications.onButtonClicked.addListener(function(notificationId, butt onIndex) 123 chrome.notifications.onButtonClicked.addListener(function(notificationId, butt onIndex)
121 { 124 {
122 notificationButtonClick(buttonIndex); 125 notificationButtonClick(buttonIndex);
123 clearActiveNotification(notificationId); 126 clearActiveNotification(notificationId);
124 }); 127 });
125 chrome.notifications.onClicked.addListener(clearActiveNotification); 128 chrome.notifications.onClicked.addListener(clearActiveNotification);
126 chrome.notifications.onClosed.addListener(notificationClosed); 129 chrome.notifications.onClosed.addListener(notificationClosed);
127 } 130 }
131
132 /**
133 * Initializes the notification system.
134 */
135 exports.initNotifications = function()
136 {
137 if (canUseChromeNotifications)
138 initChromeNotifications();
139 initAntiAdblockNotification();
140 };
128 141
129 let showNextNotification = 142 let showNextNotification =
130 /** 143 /**
131 * Shows the next notification from the queue if any. 144 * Shows the next notification from the queue if any.
132 * 145 *
133 * @param {URL} [url] URL to match notifications to 146 * @param {URL} [url] URL to match notifications to
134 */ 147 */
135 exports.showNextNotification = function(url) 148 exports.showNextNotification = function(url)
136 { 149 {
137 let notification = NotificationStorage.getNextToShow(url && stringifyURL(url)) ; 150 let notification = NotificationStorage.getNextToShow(url && stringifyURL(url)) ;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 if (activeNotification.type == "question") 220 if (activeNotification.type == "question")
208 notificationButtonClick(approved ? 0 : 1); 221 notificationButtonClick(approved ? 0 : 1);
209 else if (approved) 222 else if (approved)
210 openNotificationLinks(); 223 openNotificationLinks();
211 } 224 }
212 } 225 }
213 prepareNotificationIconAndPopup(); 226 prepareNotificationIconAndPopup();
214 }; 227 };
215 228
216 setTimeout(showNextNotification, 3 * 60 * 1000); 229 setTimeout(showNextNotification, 3 * 60 * 1000);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld