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

Delta Between Two Patch Sets: notification.js

Issue 29532767: Issue 5593 - Use messaging in popup for prefs, whitelisting, and stats (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Fix lint error and simplify code Created Sept. 24, 2017, 10:34 p.m.
Right Patch Set: Revert one more instance of ext.pages.open Created Sept. 27, 2017, 9:40 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') | popup.html » ('j') | stats.js » ('J')
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-present eyeo GmbH 3 * Copyright (C) 2006-present 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
20 const {require} = ext.backgroundPage.getWindow();
19 21
20 const {Utils} = require("utils"); 22 const {Utils} = require("utils");
21 const {Notification} = require("notification"); 23 const {Notification} = require("notification");
22 const {getActiveNotification, shouldDisplay} = require("notificationHelper"); 24 const {getActiveNotification, shouldDisplay} = require("notificationHelper");
23 25
24 function getDocLinks(notification) 26 function getDocLinks(notification)
25 { 27 {
26 if (!notification.links) 28 if (!notification.links)
27 return []; 29 return [];
28 30
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 77
76 messageElement.addEventListener("click", event => 78 messageElement.addEventListener("click", event =>
77 { 79 {
78 let link = event.target; 80 let link = event.target;
79 while (link && link !== messageElement && link.localName !== "a") 81 while (link && link !== messageElement && link.localName !== "a")
80 link = link.parentNode; 82 link = link.parentNode;
81 if (!link) 83 if (!link)
82 return; 84 return;
83 event.preventDefault(); 85 event.preventDefault();
84 event.stopPropagation(); 86 event.stopPropagation();
85 chrome.tabs.create({url: link.href}); 87 ext.pages.open(link.href);
86 }); 88 });
87 89
88 let notificationElement = document.getElementById("notification"); 90 let notificationElement = document.getElementById("notification");
89 notificationElement.className = notification.type; 91 notificationElement.className = notification.type;
90 notificationElement.hidden = false; 92 notificationElement.hidden = false;
91 notificationElement.addEventListener("click", event => 93 notificationElement.addEventListener("click", event =>
92 { 94 {
93 if (event.target.id == "notification-close") 95 if (event.target.id == "notification-close")
94 notificationElement.classList.add("closing"); 96 notificationElement.classList.add("closing");
95 else if (event.target.id == "notification-optout" || 97 else if (event.target.id == "notification-optout" ||
96 event.target.id == "notification-hide") 98 event.target.id == "notification-hide")
97 { 99 {
98 if (event.target.id == "notification-optout") 100 if (event.target.id == "notification-optout")
99 Notification.toggleIgnoreCategory("*", true); 101 Notification.toggleIgnoreCategory("*", true);
100 102
101 notificationElement.hidden = true; 103 notificationElement.hidden = true;
102 notification.onClicked(); 104 notification.onClicked();
103 } 105 }
104 }, true); 106 }, true);
105 }, false); 107 }, false);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld