Issue 1518 - Got rid of deprecated code using webkitNotifications

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
@@ skipping 23 matching lines @@
   this.isFrameWhitelisted = isFrameWhitelisted;
   this.processKey = processKey;
   this.getKey = getKey;
 }
 var FilterStorage = require("filterStorage").FilterStorage;
 var ElemHide = require("elemHide").ElemHide;
 var defaultMatcher = require("matcher").defaultMatcher;
 var Prefs = require("prefs").Prefs;
 var Synchronizer = require("synchronizer").Synchronizer;
 var Utils = require("utils").Utils;
-var Notification = require("notification").Notification;
+var NotificationStorage = require("notification").Notification;
 var initAntiAdblockNotification = require("antiadblockInit").initAntiAdblockNotification;
 var parseFilters = require("filterValidation").parseFilters;
 
 // Some types cannot be distinguished
 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
 RegExpFilter.typeMap.MEDIA = RegExpFilter.typeMap.FONT = RegExpFilter.typeMap.OTHER;
 
 // Chrome on Linux does not fully support chrome.notifications until version 35
 // https://code.google.com/p/chromium/issues/detail?id=291485
 var canUseChromeNotifications = require("info").platform == "chromium"
@@ skipping 237 matching lines @@
         win.openTab(Utils.getDocLink(link));
       });
     });
   }
 }
 
 function notificationButtonClick(buttonIndex)
 {
   if (activeNotification.type === "question")
   {
-    Notification.triggerQuestionListeners(activeNotification.id, buttonIndex === 0);
-    Notification.markAsShown(activeNotification.id);
+    NotificationStorage.triggerQuestionListeners(activeNotification.id, buttonIndex === 0);
+    NotificationStorage.markAsShown(activeNotification.id);
     activeNotification.onClicked();
   }
   else if (activeNotification.links && activeNotification.links[buttonIndex])
   {
     ext.windows.getLastFocused(function(win)
     {
       win.openTab(Utils.getDocLink(activeNotification.links[buttonIndex]));
     });
   }
 }
@@ skipping 44 matching lines @@
 }
 
 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 texts = NotificationStorage.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;
 
     if (canUseChromeNotifications)
     {
       var opts = {
         type: "basic",
         title: title,
@@ skipping 14 matching lines @@
         while (match = regex.exec(plainMessage))
           opts.buttons.push({title: match[1]});
       }
 
       imgToBase64(iconUrl, function(iconData)
       {
         opts["iconUrl"] = iconData;
         chrome.notifications.create("", opts, function() {});
       });
     }
-    else if (hasWebkitNotifications && "createNotification" in webkitNotifications && activeNotification.type !== "question")
+    else if ("Notification" in window && activeNotification.type !== "question")
     {
       if (hasLinks)
         message += " " + ext.i18n.getMessage("notification_without_buttons");
 
       imgToBase64(iconUrl, function(iconData)
       {
-        var notification = webkitNotifications.createNotification(iconData, title, message);
-        notification.show();
-        notification.addEventListener("click", openNotificationLinks, false);
-        notification.addEventListener("close", notificationClosed, false);
+        var notification = new Notification(
+          title,
+          {
+            lang: Utils.appLocale,
+            dir: ext.i18n.getMessage("@@bidi_dir"),
+            body: message,
+            icon: iconData
+          }
+        );
+
+        notification.onclick = openNotificationLinks;
+        notification.onclose = notificationClosed;

[Wladimir Palant, 2015/01/13 07:39:16]

I certainly prefer addEventListener() to onclick - while it is more verbose, you
can just assume that there will be no interactions with other code.

[Sebastian Noack, 2015/01/13 12:30:20]

Thanks for pointing this out. I just overlooked the addEventListener() method
while reading the docs.

       });
     }
     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")
@@ skipping 142 matching lines @@
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
-  var notificationToShow = Notification.getNextToShow();
+  var notificationToShow = NotificationStorage.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);