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

Side by Side Diff: background.js

Issue 6098518317989888: Fix: Notification popup is broken (Closed)
Patch Set: moved code from /extcommon to ext/background Created Feb. 19, 2014, 1:09 p.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 | « no previous file | chrome/ext/background.js » ('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-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
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 { 285 {
286 activeNotification.onClicked = function() 286 activeNotification.onClicked = function()
287 { 287 {
288 iconAnimation.stop(); 288 iconAnimation.stop();
289 activeNotification = null; 289 activeNotification = null;
290 }; 290 };
291 291
292 iconAnimation.update(activeNotification.severity); 292 iconAnimation.update(activeNotification.severity);
293 } 293 }
294 294
295 function openNotificationLinks()
296 {
297 if (activeNotification.links)
298 {
299 activeNotification.links.forEach(function(link)
300 {
301 ext.windows.getLastFocused(function(win)
302 {
303 win.openTab(Utils.getDocLink(link));
304 });
305 });
306 }
307 prepareNotificationIconAndPopup();
308 }
309
310 function notificationButtonClick(id, index)
311 {
312 if (activeNotification.links && activeNotification.links[index])
313 {
314 ext.windows.getLastFocused(function(win)
315 {
316 win.openTab(Utils.getDocLink(activeNotification.links[index]));
317 });
318 }
319 prepareNotificationIconAndPopup();
320 }
321
295 function showNotification(notification) 322 function showNotification(notification)
296 { 323 {
297 activeNotification = notification; 324 activeNotification = notification;
298 325 if (activeNotification.severity === "critical")
299 if (activeNotification.severity === "critical"
300 && typeof webkitNotifications !== "undefined")
301 { 326 {
302 var notification = webkitNotifications.createHTMLNotification("notification. html"); 327 var hasWebkitNotifications = typeof webkitNotifications !== "undefined";
303 notification.show(); 328 if (hasWebkitNotifications && "createHTMLNotification" in webkitNotification s)
304 notification.addEventListener("close", prepareNotificationIconAndPopup); 329 {
330 var notification = webkitNotifications.createHTMLNotification("notificatio n.html");
331 notification.show();
332 notification.addEventListener("close", prepareNotificationIconAndPopup, fa lse);
333 return;
334 }
335
336 var texts = Notification.getLocalizedTexts(notification);
337 var title = texts.title ? texts.title : "";
Felix Dahlke 2014/02/21 09:48:49 How about: var title = texts.title || "";
saroyanm 2014/02/21 13:39:22 Looks cool :)
338 var message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
339 var iconUrl = ext.getURL("icons/abp-128.png");
340 if ("notifications" in ext)
Felix Dahlke 2014/02/21 09:48:49 I personally find it a bit confusing to have ext.n
Thomas Greiner 2014/02/21 09:53:43 Since we want to look into a Safari specific imple
Felix Dahlke 2014/02/21 09:56:22 My point is basically that, in the current stage,
Felix Dahlke 2014/02/21 10:04:01 Well, I don't have that strong feelings about this
saroyanm 2014/02/21 13:39:22 This looks a bit tricky, Anyway if we could move a
Thomas Greiner 2014/02/21 13:59:55 Large parts of the notifications code is also shar
saroyanm 2014/02/21 15:11:52 Thanks for pointing this, maybe I'll have some que
341 {
342 var opt = {
Felix Dahlke 2014/02/21 09:48:49 Shouldn't it be plural "opts"?
saroyanm 2014/02/21 13:39:22 Done.
343 type: "basic",
344 title: title,
345 message: message,
346 iconUrl: iconUrl,
347 buttons: []
348 };
349 var regex = /<a>(.*?)<\/a>/g;
350 var plainMessage = texts.message ? texts.message : "";
351 while (regex.test(plainMessage))
352 opt.buttons.push({title: RegExp.$1});
Felix Dahlke 2014/02/21 09:48:49 RegExp.$n is deprecated (https://developer.mozilla
saroyanm 2014/02/21 13:39:22 Good point. I've made performance test between th
Felix Dahlke 2014/02/21 13:48:20 A single match call would suffice in the first exa
353
354 var notification = ext.notifications;
355 notification.create("", opt, function() {});
356 notification.onClosed.addListener(prepareNotificationIconAndPopup);
357 notification.onButtonClicked.addListener(notificationButtonClick);
358 }
359 else if (hasWebkitNotifications && "createNotification" in webkitNotificatio ns)
360 {
361 var notification = webkitNotifications.createNotification(iconUrl, title, message);
362 notification.show();
363 notification.addEventListener("close", prepareNotificationIconAndPopup, fa lse);
364 notification.addEventListener("click", openNotificationLinks, false);
365 }
366 else
367 {
368 var notification = confirm(title + "\n" + message);
Felix Dahlke 2014/02/21 09:48:49 I think we should add some explanatory text here f
saroyanm 2014/02/21 13:39:22 Good point.
369 if (notification == true)
370 openNotificationLinks();
371 }
305 } 372 }
306 else 373 else
307 prepareNotificationIconAndPopup(); 374 prepareNotificationIconAndPopup();
308 } 375 }
309 376
310 ext.onMessage.addListener(function (msg, sender, sendResponse) 377 ext.onMessage.addListener(function (msg, sender, sendResponse)
311 { 378 {
312 switch (msg.type) 379 switch (msg.type)
313 { 380 {
314 case "get-selectors": 381 case "get-selectors":
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 tab.sendMessage({type: "clickhide-deactivate"}); 486 tab.sendMessage({type: "clickhide-deactivate"});
420 refreshIconAndContextMenu(tab); 487 refreshIconAndContextMenu(tab);
421 }); 488 });
422 489
423 setTimeout(function() 490 setTimeout(function()
424 { 491 {
425 var notificationToShow = Notification.getNextToShow(); 492 var notificationToShow = Notification.getNextToShow();
426 if (notificationToShow) 493 if (notificationToShow)
427 showNotification(notificationToShow); 494 showNotification(notificationToShow);
428 }, 3 * 60 * 1000); 495 }, 3 * 60 * 1000);
OLDNEW
« no previous file with comments | « no previous file | chrome/ext/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld