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

Delta Between Two Patch Sets: notification.js

Issue 11161031: Show notifications on startup (Chrome) (Closed)
Left Patch Set: Address issue from the Firefox review Created July 20, 2013, 10:51 p.m.
Right Patch Set: Addressed issues Created July 23, 2013, 12:51 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 | « notification.html ('k') | popup.html » ('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 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH
4 *
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
7 * published by the Free Software Foundation.
8 *
9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
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/>.
16 */
17
18 var backgroundPage = chrome.extension.getBackgroundPage();
19 var require = backgroundPage.require;
20
21 var Utils = require("utils").Utils;
22 var Notification = require("notification").Notification;
23
24 function getDocLinks(notification)
25 {
26 if (!notification.links)
27 return [];
28
29 var docLinks = [];
30 notification.links.forEach(function(link)
31 {
32 docLinks.push(Utils.getDocLink(link));
33 });
34 return docLinks;
35 }
36
37 function insertMessage(element, text, links)
38 {
39 var match = /^(.*?)<(a|strong)>(.*?)<\/\2>(.*)$/.exec(text);
40 if (!match)
41 {
42 element.appendChild(document.createTextNode(text));
43 return;
44 }
45
46 var before = match[1];
47 var tagName = match[2];
48 var value = match[3];
49 var after = match[4];
50
51 insertMessage(element, before, links);
52
53 var newElement = document.createElement(tagName);
54 if (tagName === "a" && links && links.length)
55 newElement.href = links.shift();
56 insertMessage(newElement, value, links);
57 element.appendChild(newElement);
58
59 insertMessage(element, after, links);
60 }
61
1 window.addEventListener("load", function() 62 window.addEventListener("load", function()
2 { 63 {
3 var backgroundPage = chrome.extension.getBackgroundPage();
4 var notification = backgroundPage.activeNotification; 64 var notification = backgroundPage.activeNotification;
5 if (!notification) 65 if (!notification)
6 return; 66 return;
7 67
8 if (notification.onClicked) 68 if (notification.onClicked)
9 notification.onClicked(); 69 notification.onClicked();
10 70
11 var texts = backgroundPage.getLocalizedTexts(notification); 71 var texts = Notification.getLocalizedTexts(notification);
Wladimir Palant 2013/07/21 11:15:30 Call Notification and Utils directly here (via req
Felix Dahlke 2013/07/22 12:30:15 Done. Not sure why I didn't do it in fact.
12 var titleElement = document.getElementById("title"); 72 var titleElement = document.getElementById("title");
13 titleElement.innerHTML = texts.title; 73 titleElement.textContent = texts.title;
Wladimir Palant 2013/07/21 11:15:30 textContent please, not innerHTML.
Felix Dahlke 2013/07/22 12:30:15 Done.
74
75 var docLinks = getDocLinks(notification);
14 var messageElement = document.getElementById("message"); 76 var messageElement = document.getElementById("message");
15 messageElement.innerHTML = texts.message; 77 insertMessage(messageElement, texts.message, docLinks);
Wladimir Palant 2013/07/21 11:15:30 Please use the same code as in Firefox here, not i
Felix Dahlke 2013/07/21 12:19:53 Hehe, I thought I'd try :D This should be safe in
Felix Dahlke 2013/07/22 12:30:15 Done. I think it's less than great that this code
16 78
17 var docLinks = backgroundPage.getDocLinks(notification); 79 messageElement.addEventListener("click", function(event)
18 var linkElements = messageElement.getElementsByTagName("a");
19 for (var i = 0; i < linkElements.length; i++)
20 { 80 {
21 var linkElement = linkElements[i]; 81 var link = event.target;
22 if (docLinks && docLinks.length) 82 while (link && link !== messageElement && link.localName !== "a")
23 linkElement.href = docLinks.shift(); 83 link = link.parentNode;
24 linkElement.addEventListener("click", function(event) 84 if (!link)
25 { 85 return;
26 event.preventDefault(); 86 event.preventDefault();
27 event.stopPropagation(); 87 event.stopPropagation();
28 chrome.tabs.create({url: linkElement.href}); 88 chrome.tabs.create({url: link.href});
29 }); 89 });
30 }
31 90
32 var notificationElement = document.getElementById("notification"); 91 var notificationElement = document.getElementById("notification");
33 notificationElement.className = notification.severity; 92 notificationElement.className = notification.severity;
34 notificationElement.style.display = "block"; 93 notificationElement.style.display = "block";
35 }); 94 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld