Fixed miscellaneous issues with anti-adblock notification port

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 with(require("filterClasses"))
 {
   this.Filter = Filter;
-  this.ActiveFilter = ActiveFilter;
   this.RegExpFilter = RegExpFilter;
   this.BlockingFilter = BlockingFilter;
   this.WhitelistFilter = WhitelistFilter;
 }
 with(require("subscriptionClasses"))
 {
   this.Subscription = Subscription;
   this.DownloadableSubscription = DownloadableSubscription;
 }
 with(require("whitelisting"))
@@ skipping 312 matching lines @@
   }
   else if (activeNotification.links && activeNotification.links[index])
   {
     ext.windows.getLastFocused(function(win)
     {
       win.openTab(Utils.getDocLink(activeNotification.links[index]));
     });
   }
 }
 
+function notificationClosed()
+{
+  activeNotification = null;
+}
+
+// Chrome on Linux does not fully support chrome.notifications until version 35

[Felix Dahlke, 2014/03/28 13:10:41]

Since this is executed immediately, I would have expected it at the bottom. How
about putting this in some "initChromeNotifications" function (or whatever) and
calling that at the bottom?

[Thomas Greiner, 2014/03/28 15:57:08]

Done.

+// https://code.google.com/p/chromium/issues/detail?id=291485
+var canUseChromeNotifications = (require("info").platform == "chromium" && "notifications" in chrome && (navigator.platform.indexOf("Linux") == -1 || parseInt(require("info").applicationVersion) > 34));

[Felix Dahlke, 2014/03/28 13:10:41]

The outer parentheses are redundant here. And I'd be in favor of wrapping this
at the &&s, super long line :D

[Thomas Greiner, 2014/03/28 15:57:08]

Done.

+if (canUseChromeNotifications)
+{
+  chrome.notifications.onButtonClicked.addListener(notificationButtonClick);
+  chrome.notifications.onClosed.addListener(notificationClosed);
+  // Chrome hides notifications in notification center when clicked so we need to close them
+  chrome.notifications.onClicked.addListener(function(id, callback)
+  {
+    chrome.notifications.clear(id, function(wasCleared)
+    {
+      if (wasCleared)
+        notificationClosed();
+    });
+  });
+}
+
 function showNotification(notification)
 {
   if (activeNotification && activeNotification.id === notification.id)
     return;
   
   activeNotification = notification;
   if (activeNotification.type === "critical" || activeNotification.type === "question")
   {
     var hasWebkitNotifications = typeof webkitNotifications !== "undefined";
     if (hasWebkitNotifications && "createHTMLNotification" in webkitNotifications)
     {
       var notification = webkitNotifications.createHTMLNotification("notification.html");
       notification.show();
       prepareNotificationIconAndPopup();
       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");
     var hasLinks = activeNotification.links && activeNotification.links.length > 0;
     
-    // Chrome on Linux does not fully support chrome.notifications yet
-    // https://code.google.com/p/chromium/issues/detail?id=291485
-    if (require("info").platform == "chromium" && "notifications" in chrome && navigator.platform.indexOf("Linux") == -1)
+    if (canUseChromeNotifications)
     {
       var opts = {
         type: "basic",
         title: title,
         message: message,
         iconUrl: iconUrl,
         buttons: [],
         priority: 2 // We use the highest priority to prevent the notification from closing automatically
       };
       if (activeNotification.type === "question")
       {
         opts.buttons.push({title: ext.i18n.getMessage("overlay_notification_button_yes")});
         opts.buttons.push({title: ext.i18n.getMessage("overlay_notification_button_no")});
       }
       else
       {
         var regex = /<a>(.*?)<\/a>/g;
         var plainMessage = texts.message || "";
         var match;
         while (match = regex.exec(plainMessage))
           opts.buttons.push({title: match[1]});
       }
       
       chrome.notifications.create("", opts, function() {});
-      chrome.notifications.onButtonClicked.addListener(notificationButtonClick);
     }
     else if (hasWebkitNotifications && "createNotification" in webkitNotifications && activeNotification.type !== "question")
     {
       if (hasLinks)
         message += " " + ext.i18n.getMessage("notification_without_buttons");
         
       var notification = webkitNotifications.createNotification(iconUrl, title, message);
       notification.show();
       notification.addEventListener("click", openNotificationLinks, false);
+      notification.addEventListener("close", notificationClosed, false);
     }
     else
     {
       var message = title + "\n" + message;
       if (hasLinks)
         message += "\n\n" + ext.i18n.getMessage("notification_with_buttons");
         
       var approved = confirm(message);
       if (activeNotification.type === "question")
         notificationButtonClick(null, approved ? 0 : 1);
@@ skipping 104 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);