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 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 || "";
+    var message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
+    var iconUrl = ext.getURL("icons/abp-128.png");
+    if ("browserNotifications" in ext) 
+    {
+      var opts = {
+        type: "basic",
+        title: title,
+        message: message,
+        iconUrl: iconUrl,
+        buttons: []
+      };
+      var regex = /<a>(.*?)<\/a>/g;
+      var plainMessage = texts.message || "";
+      while (match = regex.exec(plainMessage))

[Felix Dahlke, 2014/02/21 13:53:40]

As I said in my other comment, feel free to stick to this approach if you prefer
it to the map readability-wise. But calling regex.exec once is sufficient, the
result is an array. Also, that variable shouldn't be a global.

[Thomas Greiner, 2014/02/21 14:35:53]

Avoid making "match" a global variable by prepending "var".

[Thomas Greiner, 2014/02/21 14:35:53]

@Felix Calling it once is not enough. regex.exec returns an array but only for
the first match (e.g. ["<a>test</a>", "test"]). Calling exec the second time
returns the second match and so on.

[Felix Dahlke, 2014/02/21 15:01:48]

Oh yeah, we have multiple links of course, silly me :)

[saroyanm, 2014/02/21 15:03:25]

Thomas was faster :) 
Actually I'm not sure but is there a preferability to declare literal regExp by
assigning to variable ? If no, then after adding the var match, maybe using this
script will be much shorter:
plainMessage.match(/<a>(.*?)<\/a>/g).map(function(val)
{
   opts.buttons.push({title: val.replace(/<\/?a>/g, '')});
});

What you think @Thomas on this ?

[Thomas Greiner, 2014/02/21 15:18:43]

This is of course an option but I prefer the current approach simply because the
regular expression already gives us the plain-text string. Therefore I'd leave
it as it is and just apply the change that I suggested in my previous comment.

[saroyanm, 2014/02/21 15:29:00]

Already applied. The case is I didn't prepend because of syntax error, so I've
declared a variable.

+        opts.buttons.push({title: match[1]});
+      
+      var notification = ext.browserNotifications;
+      notification.create("", opts, function() {});
+      notification.onClosed.addListener(prepareNotificationIconAndPopup);
+      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 message = title + "\n" + message;
+      if (activeNotification.links && activeNotification.links.length > 0)
+      {
+        message += "\n\nClick 'OK' to open the links in this notification.";

[Felix Dahlke, 2014/02/21 13:53:40]

This needs to be translated :) You can just add the en-US variant, the others
will be added after the translation phase.

[saroyanm, 2014/02/21 15:03:25]

Thanks for pointing this.

+      }
+      var notification = confirm(message);
+      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);