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

Delta Between Two Patch Sets: notification.js

Issue 29317001: Relocated icon and redesigned icon popup (Closed)
Left Patch Set: Created Nov. 7, 2013, 5:44 p.m.
Right Patch Set: Merged setBadgeNumber and setBadgeBackgroundColor Created Dec. 13, 2013, 10:36 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
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH 3 * Copyright (C) 2006-2013 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 var backgroundPage = chrome.extension.getBackgroundPage(); 18 var backgroundPage = ext.backgroundPage.getWindow();
19 var require = backgroundPage.require; 19 var require = backgroundPage.require;
20 20
21 var Utils = require("utils").Utils; 21 var Utils = require("utils").Utils;
22 var Notification = require("notification").Notification; 22 var Notification = require("notification").Notification;
23 23
24 function getDocLinks(notification) 24 function getDocLinks(notification)
25 { 25 {
26 if (!notification.links) 26 if (!notification.links)
27 return []; 27 return [];
28 28
(...skipping 26 matching lines...) Expand all
55 newElement.href = links.shift(); 55 newElement.href = links.shift();
56 insertMessage(newElement, value, links); 56 insertMessage(newElement, value, links);
57 element.appendChild(newElement); 57 element.appendChild(newElement);
58 58
59 insertMessage(element, after, links); 59 insertMessage(element, after, links);
60 } 60 }
61 61
62 window.addEventListener("load", function() 62 window.addEventListener("load", function()
63 { 63 {
64 var notification = backgroundPage.activeNotification; 64 var notification = backgroundPage.activeNotification;
65
66 if (!notification) 65 if (!notification)
67 return; 66 return;
68 67
69 if (notification.onClicked) 68 if (notification.onClicked)
70 notification.onClicked(); 69 notification.onClicked();
71 70
72 var texts = Notification.getLocalizedTexts(notification); 71 var texts = Notification.getLocalizedTexts(notification);
73 var titleElement = document.getElementById("notification-title"); 72 var titleElement = document.getElementById("notification-title");
74 titleElement.textContent = texts.title; 73 titleElement.textContent = texts.title;
75 74
76 var docLinks = getDocLinks(notification); 75 var docLinks = getDocLinks(notification);
77 var messageElement = document.getElementById("notification-message"); 76 var messageElement = document.getElementById("notification-message");
78 insertMessage(messageElement, texts.message, docLinks); 77 insertMessage(messageElement, texts.message, docLinks);
79 78
80 messageElement.addEventListener("click", function(event) 79 messageElement.addEventListener("click", function(event)
81 { 80 {
82 var link = event.target; 81 var link = event.target;
83 while (link && link !== messageElement && link.localName !== "a") 82 while (link && link !== messageElement && link.localName !== "a")
84 link = link.parentNode; 83 link = link.parentNode;
85 if (!link) 84 if (!link)
86 return; 85 return;
87 event.preventDefault(); 86 event.preventDefault();
88 event.stopPropagation(); 87 event.stopPropagation();
89 chrome.tabs.create({url: link.href}); 88 ext.windows.getLastFocused(function(win) { win.openTab(link.href); });
90 }); 89 });
91 90
92 var notificationElement = document.getElementById("notification"); 91 var notificationElement = document.getElementById("notification");
93 notificationElement.className = notification.severity; 92 notificationElement.className = notification.severity;
94 notificationElement.style.display = "block"; 93 notificationElement.style.display = "block";
95 }); 94 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld