Issue 5760 - Use relative require paths

lib/notificationHelper.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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/>.
  */
 
 /** @module notificationHelper */
 
 "use strict";
 
 const {startIconAnimation, stopIconAnimation} = require("./icon");
 const {Utils} = require("./utils");
-const {Notification: NotificationStorage} = require(
-"../adblockpluscore/lib/notification");
+const {Notification: NotificationStorage} =
+  require("../adblockpluscore/lib/notification");
 const {stringifyURL} = require("./url");
-const {initAntiAdblockNotification} = require(
-"../adblockplusui/lib/antiadblockInit");
+const {initAntiAdblockNotification} =
+  require("../adblockplusui/lib/antiadblockInit");
 const {Prefs} = require("./prefs");
 const {showOptions} = require("./options");
 
 let activeNotification = null;
 let activeButtons = null;
 let defaultDisplayMethods = ["popup"];
 let displayMethods = Object.create(null);
 displayMethods.critical = ["icon", "notification", "popup"];
 displayMethods.question = ["notification"];
 displayMethods.normal = ["notification"];
@@ skipping 82 matching lines @@
     case "link":
       browser.tabs.create({
         url: Utils.getDocLink(activeNotification.links[buttonIndex])
       });
       break;
     case "open-all":
       openNotificationLinks();
       break;
     case "configure":
       Prefs.notifications_showui = true;
-      showOptions(page =>
-      {
-        page.sendMessage({
+      showOptions((page, port) =>
+      {
+        port.postMessage({
           type: "app.respond",
           action: "focusSection",
           args: ["notifications"]
         });
       });
       break;
     case "question":
       NotificationStorage.triggerQuestionListeners(activeNotification.id,
                                                    buttonIndex == 0);
       NotificationStorage.markAsShown(activeNotification.id);
@@ skipping 57 matching lines @@
       let notificationOptions = {
         type: "basic",
         title,
         iconUrl,
         message,
         buttons: activeButtons.map(button => ({title: button.title})),
         // We use the highest priority to prevent the notification
         // from closing automatically.
         priority: 2
       };
-      browser.notifications.create("", notificationOptions, () =>
-      {
-        // Opera does not support the addition of buttons to notifications.
-        // Question type notfications always include buttons.
-        if (browser.runtime.lastError && activeNotification.type != "question")
+
+      // Firefox and Opera don't support buttons. Firefox throws synchronously,
+      // while Opera gives an asynchronous error. Wrapping the promise like
+      // this, turns the synchronous error on Firefox into a promise rejection.
+      new Promise(resolve =>
+      {
+        resolve(browser.notifications.create(notificationOptions));
+      }).catch(() =>
+      {
+        // Without buttons, showing notifications of the type "question" is
+        // pointless. For other notifications, retry with the buttons removed.
+        if (activeNotification.type != "question")
         {
           delete notificationOptions.buttons;
-          browser.notifications.create("", notificationOptions);
+          browser.notifications.create(notificationOptions);
         }
       });
     }
     else if ("Notification" in window && activeNotification.type != "question")
     {
       if (linkCount > 0)
       {
         message += " " + browser.i18n.getMessage(
           "notification_without_buttons"
         );
@@ skipping 60 matching lines @@
  * @param {string} method Display method: icon, notification or popup
  * @param {string} notificationType
  * @return {boolean}
  */
 exports.shouldDisplay = (method, notificationType) =>
 {
   let methods = displayMethods[notificationType] || defaultDisplayMethods;
   return methods.includes(method);
 };
 
+/**
+ * Tidies up after a notification was clicked.
+ */
+exports.notificationClicked = () =>
+{
+  if (activeNotification)
+    activeNotification.onClicked();
+};
+
 ext.pages.onLoading.addListener(page =>
 {
   NotificationStorage.showNext(stringifyURL(page.url));
 });
 
 NotificationStorage.addShowListener(showNotification);