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

Delta Between Two Patch Sets: notification.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Left Patch Set: Define and destructure backgroundPage more consistently, fix minor whitespace errors Created Jan. 18, 2017, 7:34 a.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:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/whitelisting.js ('k') | options.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-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 "use strict"; 18 "use strict";
19 19
20 const backgroundPage = ext.backgroundPage.getWindow(); 20 const {require} = ext.backgroundPage.getWindow();
21 const {require} = backgroundPage;
Sebastian Noack 2017/01/18 11:24:28 Note that backgroundPage isn't used anywhere else,
kzar 2017/01/18 11:46:39 Done.
22 21
23 const {Utils} = require("utils"); 22 const {Utils} = require("utils");
24 const {Notification} = require("notification"); 23 const {Notification} = require("notification");
25 const {getActiveNotification, shouldDisplay} = require("notificationHelper"); 24 const {getActiveNotification, shouldDisplay} = require("notificationHelper");
26 25
27 function getDocLinks(notification) 26 function getDocLinks(notification)
28 { 27 {
29 if (!notification.links) 28 if (!notification.links)
30 return []; 29 return [];
31 30
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 break; 99 break;
101 case "notification-optout": 100 case "notification-optout":
102 Notification.toggleIgnoreCategory("*", true); 101 Notification.toggleIgnoreCategory("*", true);
103 case "notification-hide": 102 case "notification-hide":
104 notificationElement.hidden = true; 103 notificationElement.hidden = true;
105 notification.onClicked(); 104 notification.onClicked();
106 break; 105 break;
107 } 106 }
108 }, true); 107 }, true);
109 }, false); 108 }, false);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld