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

Side by Side Diff: notification.js

Issue 5088751004942336: Issue 370 - Right-clicked element is removed independent of created filter (Closed)
Patch Set: Rebase to rev 3c9cea80c481 Created July 18, 2014, 8:54 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « metadata.safari ('k') | options.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-2014 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 //This case is true only for chrome when loading from notification.html
19 if (typeof ext === "undefined")
20 {
21 var ext = chrome.extension.getBackgroundPage().ext;
22 }
23
18 var backgroundPage = ext.backgroundPage.getWindow(); 24 var backgroundPage = ext.backgroundPage.getWindow();
19 var require = backgroundPage.require; 25 var require = backgroundPage.require;
20 26
21 var Utils = require("utils").Utils; 27 var Utils = require("utils").Utils;
22 var Notification = require("notification").Notification; 28 var Notification = require("notification").Notification;
23 29
24 function getDocLinks(notification) 30 function getDocLinks(notification)
25 { 31 {
26 if (!notification.links) 32 if (!notification.links)
27 return []; 33 return [];
(...skipping 30 matching lines...) Expand all
58 64
59 insertMessage(element, after, links); 65 insertMessage(element, after, links);
60 } 66 }
61 67
62 window.addEventListener("load", function() 68 window.addEventListener("load", function()
63 { 69 {
64 var notification = backgroundPage.activeNotification; 70 var notification = backgroundPage.activeNotification;
65 if (!notification) 71 if (!notification)
66 return; 72 return;
67 73
68 if (notification.onClicked)
69 notification.onClicked();
70
71 var texts = Notification.getLocalizedTexts(notification); 74 var texts = Notification.getLocalizedTexts(notification);
72 var titleElement = document.getElementById("notification-title"); 75 var titleElement = document.getElementById("notification-title");
73 titleElement.textContent = texts.title; 76 titleElement.textContent = texts.title;
74 77
75 var docLinks = getDocLinks(notification); 78 var docLinks = getDocLinks(notification);
76 var messageElement = document.getElementById("notification-message"); 79 var messageElement = document.getElementById("notification-message");
77 insertMessage(messageElement, texts.message, docLinks); 80 insertMessage(messageElement, texts.message, docLinks);
78 81
79 messageElement.addEventListener("click", function(event) 82 messageElement.addEventListener("click", function(event)
80 { 83 {
81 var link = event.target; 84 var link = event.target;
82 while (link && link !== messageElement && link.localName !== "a") 85 while (link && link !== messageElement && link.localName !== "a")
83 link = link.parentNode; 86 link = link.parentNode;
84 if (!link) 87 if (!link)
85 return; 88 return;
86 event.preventDefault(); 89 event.preventDefault();
87 event.stopPropagation(); 90 event.stopPropagation();
88 ext.windows.getLastFocused(function(win) { win.openTab(link.href); }); 91 ext.pages.open(link.href);
89 }); 92 });
90 93
94 if (notification.type == "question")
95 {
96 document.getElementById("notification-question").addEventListener("click", f unction(event)
97 {
98 event.preventDefault();
99 event.stopPropagation();
100
101 var approved = false;
102 switch (event.target.id)
103 {
104 case "notification-yes":
105 approved = true;
106 case "notification-no":
107 Notification.triggerQuestionListeners(notification.id, approved);
108 Notification.markAsShown(notification.id);
109 notification.onClicked();
110 break;
111 }
112 window.close();
113 }, true);
114 }
115
91 var notificationElement = document.getElementById("notification"); 116 var notificationElement = document.getElementById("notification");
92 notificationElement.className = notification.severity; 117 notificationElement.className = notification.type;
93 notificationElement.style.display = "block"; 118 notificationElement.style.display = "block";
94 }); 119
120 document.getElementById("close-notification").addEventListener("click", functi on()
121 {
122 notificationElement.style.display = "none";
123 notification.onClicked();
124 }, false);
125 }, false);
OLDNEW
« no previous file with comments | « metadata.safari ('k') | options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld