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 274 matching lines @@
 {
   activeNotification.onClicked = function()
   {
     iconAnimation.stop();
     activeNotification = null;
   };
 
   iconAnimation.update(activeNotification.severity);
 }
 
+function openNotificationLinks() 
+{
+  if (activeNotification.links)
+  {
+    activeNotification.links.forEach(function(link)
+    {
+      ext.windows.getLastFocused(function(win)
+      {
+        win.openTab(Utils.getDocLink(link));
+      });
+    });
+  }
+  prepareNotificationIconAndPopup();
+}
+
+function notificationButtonClick(id, index)
+{
+  if (activeNotification.links && activeNotification.links[index])
+  {
+    ext.windows.getLastFocused(function(win)
+    {
+      win.openTab(Utils.getDocLink(activeNotification.links[index]));
+    });
+  }
+  prepareNotificationIconAndPopup();
+}
+
+function getNotificationLinkTitles(text)

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

You can simply do:

var titles = [];
var regex = /<a>(.*?)<\/a>/g;
while (regex.test(text))
  titles.push({title: RegExp.$1});
return titles;

[saroyanm, 2014/02/18 16:20:28]

I like this :)

+{
+  var titles = [];
+  var text = text;
+  while (text)
+  {
+    var match = /<a[^>]*>(.*?)<\/a>(.*)/.exec(text);
+    if(!match)

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

Nit: Missing space between "if" and opening bracket.

[saroyanm, 2014/02/18 16:20:28]

I have to be more attentive, I thought I fixed this.

+      return titles; 
+    titles.push({"title": match[1]});

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

That's inconsistent. The function's name suggests that it returns a list of
titles while it actually returns a list of button options.

[saroyanm, 2014/02/18 16:20:28]

Done.

+    text = match[2];
+  }
+  return titles;
+}
+
 function showNotification(notification)
 {
   activeNotification = notification;
-
-  if (activeNotification.severity === "critical"
-      && typeof webkitNotifications !== "undefined")
+  if (activeNotification.severity === "critical")
   {
-    var notification = webkitNotifications.createHTMLNotification("notification.html");
-    notification.show();
-    notification.addEventListener("close", prepareNotificationIconAndPopup);
+    var hasWebkitNotifications = typeof webkitNotifications !== "undefined";
+    if (hasWebkitNotifications && "createHTMLNotification" in webkitNotifications)
+    {
+      var notification = webkitNotifications.createHTMLNotification("notification.html");
+      notification.show();
+      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 = ext.getURL("icons/abp-128.png");
+    if ("notifications" in ext) 
+    {
+      var buttons = getNotificationLinkTitles(message);

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

There's no need for a variable here if you only use it once.

[saroyanm, 2014/02/18 16:20:28]

Done.

+      var opt = {
+        type: "basic",
+        title: title,
+        message: message,

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

HTML tags need to be stripped from message.

[saroyanm, 2014/02/18 16:20:28]

Done.

+        iconUrl: iconUrl,
+        buttons: buttons
+      };
+      var notification = ext.notifications;
+      notification.create("", opt, function() {});
+      notification.onClosed.addListener(prepareNotificationIconAndPopup);
+      notification.onClicked.addListener(openNotificationLinks);

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

We don't need this anymore if there's a button for each link anyway.

[saroyanm, 2014/02/18 16:20:28]

Done.

+      notification.onButtonClicked.addListener(notificationButtonClick);
+    }
+    else if (hasWebkitNotifications && "createNotification" in webkitNotifications)
+    {
+      var notification = webkitNotifications.createNotification(iconUrl, title, message);
+      notification.show();
+      notification.addEventListener("close", prepareNotificationIconAndPopup, false);
+      notification.addEventListener("click", openNotificationLinks, false);
+    }
+    else
+    {
+      var notification = confirm(title+"\n"+message);

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

Nit: Missing spaces. |confirm(title + "\n" + message);|

[saroyanm, 2014/02/18 16:20:28]

Done.

+      if (notification == true)
+        openNotificationLinks();
+    }
   }
   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);