Fix: Notification popup is broken

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 270 matching lines @@
   });
 }
 
 function prepareNotificationIconAndPopup()
 {
   activeNotification.onClicked = function()
   {
     iconAnimation.stop();
     activeNotification = null;
   };
-
+  
   iconAnimation.update(activeNotification.severity);

[Felix Dahlke, 2014/02/27 14:10:39]

Nit: Probably whitespace differences, this shouldn't register as a diff.

 }
 
-function notificationWindowClick() {

[Thomas Greiner, 2014/02/17 10:02:41]

Nit: Bracket on next line

[saroyanm, 2014/02/18 10:25:08]

Done.

+function openNotificationLinks() 
+{
   if (activeNotification.links)
   {
     activeNotification.links.forEach(function(link)
     {
-      chrome.tabs.create({ url: Utils.getDocLink(link) });

[Thomas Greiner, 2014/02/17 10:02:41]

This is Chrome-specific. We do have an "openTab" method in "ext" that you can
use to make it platform independent.

[saroyanm, 2014/02/18 10:25:08]

Done.

-    });
-  }
-  prepareNotificationIconAndPopup();
-}
-
-function notificationButtonClick(id, index) {

[Thomas Greiner, 2014/02/17 10:02:41]

Nit: Bracket on next line

[saroyanm, 2014/02/18 10:25:08]

Done.

-  chrome.tabs.create({url: Utils.getDocLink(activeNotification.links[index])});

[Thomas Greiner, 2014/02/17 10:02:41]

This is Chrome-specific. We do have an "openTab" method in "ext" that you can
use to make it platform independent.

[saroyanm, 2014/02/18 10:25:08]

Done.

-  prepareNotificationIconAndPopup();
+      ext.windows.getLastFocused(function(win)
+      {
+        win.openTab(Utils.getDocLink(link));
+      });
+    });
+  }
+}
+
+function notificationButtonClick(id, index)
+{
+  if (activeNotification.links && activeNotification.links[index])
+  {
+    ext.windows.getLastFocused(function(win)
+    {
+      win.openTab(Utils.getDocLink(activeNotification.links[index]));
+    });
+  }
 }
 
 function showNotification(notification)
 {
   activeNotification = notification;
   if (activeNotification.severity === "critical")
   {
-    var isWebkit = typeof webkitNotifications !== "undefined";

[Thomas Greiner, 2014/02/17 10:02:41]

All browsers based on this repository use WebKit so the variable should rather
be something like "isPrefixed" or "hasWebkitNotifications".

[saroyanm, 2014/02/18 10:25:08]

Done.

-    if (isWebkit && "createHTMLNotification" in webkitNotifications)
-    {
-      notification = webkitNotifications.createHTMLNotification("notification.html");
+    var hasWebkitNotifications = typeof webkitNotifications !== "undefined";
+    if (hasWebkitNotifications && "createHTMLNotification" in webkitNotifications)
+    {
+      var notification = webkitNotifications.createHTMLNotification("notification.html");
       notification.show();
-      notification.addEventListener("close", prepareNotificationIconAndPopup);
+      notification.addEventListener("close", prepareNotificationIconAndPopup, false);
       return;
     }
     
     var texts = Notification.getLocalizedTexts(notification);
-    var title = texts.title ? texts.title : "";
-    var message = texts.message ? texts.message : "";
-    var iconUrl = "icons/abp-128.png";
-    if ("notifications" in chrome) 

[Thomas Greiner, 2014/02/17 10:02:41]

This is Chrome-specific but the adblockpluschrome project also includes our
Opera and Safari version. Therefore we expose platform specific functionality
only through "ext" (see chrome/ext and safari/ext).

Therefore we should move this there and call it through ext.notifications.*
instead of chrome.notifications.*

Since you don't have a Mac, we need to postpone the Safari implementation.

[saroyanm, 2014/02/18 10:25:08]

Thanks, for pointing this, now I see what is under ext dir. 
Hope I understood your point correctly, but not sure if we need to update safari
implementation if I got your point right, anyway for safari we can use
webkitNotifications, what you think ?

[Thomas Greiner, 2014/02/18 14:26:17]

That's OK for now. We can add a Safari-specific implementation at a later point.

-    {
-      var buttons = [];
-      var links = notification.links;
-      links.forEach(function(link, index){

[Thomas Greiner, 2014/02/17 10:02:41]

Nit: Missing space after closing bracket.

-        buttons.push({"title": link.replace(new RegExp("_", 'g'), " ")});

[Thomas Greiner, 2014/02/17 10:02:41]

The link texts can actually be extracted from the message because they are
contained in HTML anchor tags.

[saroyanm, 2014/02/18 10:25:08]

Maybe it make sense also to remove anchors with their content in this case ?
Because I was thinking maybe we could provide also titles for button links for
updated browser versions in notification.json.

-      });
-      var opt = {
+    var title = texts.title || "";
+    var message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
+    var iconUrl = ext.getURL("icons/abp-128.png");
+    var hasLinks = activeNotification.links && activeNotification.links.length > 0;
+    if ("browserNotifications" in ext) 
+    {
+      var opts = {
         type: "basic",
         title: title,
         message: message,
         iconUrl: iconUrl,

[Thomas Greiner, 2014/02/17 10:02:41]

You can directly inline "title", "message" and "iconUrl" instead of creating
variables for each.

[Thomas Greiner, 2014/02/17 10:02:41]

Use |ext.getURL("icons/abp-128.png")| as the icon URL.

[saroyanm, 2014/02/18 10:25:08]

while I've added also else case I'm using that variables in 3 places
(notification.create, webkitNotifications.createNotification and confirm
methods), not sure whether It's still preferable to use them inline, please let
me know in case.

[Thomas Greiner, 2014/02/18 14:26:17]

Right, that's fine then. Although you could write it in a shorter form (e.g. var
title = texts.title || "";).

-        buttons: buttons
+        buttons: []
       };
-      notification = chrome.notifications;

[Thomas Greiner, 2014/02/17 10:02:41]

Avoid creating global variables by adding "var".

[saroyanm, 2014/02/18 10:25:08]

Done.

-      notification.create("", opt, function(){});

[Thomas Greiner, 2014/02/17 10:02:41]

Nit: Missing space after closing bracket.

[saroyanm, 2014/02/18 10:25:08]

Done.

+      var regex = /<a>(.*?)<\/a>/g;
+      var plainMessage = texts.message || "";
+      var match;
+      while (match = regex.exec(plainMessage))
+        opts.buttons.push({title: match[1]});
+      
+      var notification = ext.browserNotifications;
+      notification.create("", opts, function() {});
       notification.onClosed.addListener(prepareNotificationIconAndPopup);
-      notification.onClicked.addListener(notificationWindowClick);
       notification.onButtonClicked.addListener(notificationButtonClick);
     }
-    else if (isWebkit && "createNotification" in webkitNotifications)
-    {
-      notification = webkitNotifications.createNotification(iconUrl, title, message);
+    else if (hasWebkitNotifications && "createNotification" in webkitNotifications)
+    {
+      if (hasLinks)
+        message += " " + ext.i18n.getMessage("notification_without_buttons");
+        
+      var notification = webkitNotifications.createNotification(iconUrl, title, message);
       notification.show();
-      notification.addEventListener("close", prepareNotificationIconAndPopup);

[Thomas Greiner, 2014/02/17 10:02:41]

Nit: Add third parameter

[saroyanm, 2014/02/18 10:25:08]

Done.

-      notification.addEventListener("click", notificationWindowClick);

[Thomas Greiner, 2014/02/17 10:02:41]

Nit: Add third parameter

[saroyanm, 2014/02/18 10:25:08]

Done.

+      notification.addEventListener("close", prepareNotificationIconAndPopup, false);
+      notification.addEventListener("click", openNotificationLinks, false);
+    }
+    else
+    {
+      var message = title + "\n" + message;
+      if (hasLinks)
+        message += "\n\n" + ext.i18n.getMessage("notification_with_buttons");
+        
+      if (confirm(message))

[Thomas Greiner, 2014/02/27 10:07:32]

Nit: Change to…

if (confirm(message))
  openNotificationLinks();
prepareNotificationIconAndPopup();

+      {
+        openNotificationLinks();
+        prepareNotificationIconAndPopup();
+      }
+      else
+        prepareNotificationIconAndPopup();
     }

[Thomas Greiner, 2014/02/17 10:02:41]

What about the "else" case here?

[saroyanm, 2014/02/18 10:25:08]

Added also confirm dialog for else case, thanks for the hint.

   }
   else
     prepareNotificationIconAndPopup();
 }
 
 ext.onMessage.addListener(function (msg, sender, sendResponse)
 {
   switch (msg.type)
   {
     case "get-selectors":
@@ skipping 104 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);