[adblockpluschrome] Issue 4764 - Added "relentless" notification that shows up in intervals

lib/notificationHelper.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 12 matching lines @@
 let {stringifyURL} = require("url");
 let {initAntiAdblockNotification} = require("antiadblockInit");
 
 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"];
+displayMethods.relentless = ["notification"];
 displayMethods.information = ["icon", "popup"];
 
 // Chrome on Linux does not fully support chrome.notifications until version 35
 // https://code.google.com/p/chromium/issues/detail?id=291485
 let canUseChromeNotifications = (function()
 {
   let info = require("info");
   if (info.platform == "chromium" && "notifications" in chrome)
   {
     if (navigator.platform.indexOf("Linux") == -1)
@@ skipping 48 matching lines @@
     let maxButtons = (notificationType == "critical") ? 2 : 1;
     if (buttons.length > maxButtons)
     {
       buttons = [
         {
           type: "open-all",
           title: ext.i18n.getMessage("notification_open_all")
         }
       ];
     }
-    if (notificationType != "critical")
+    if (["critical", "relentless"].indexOf(notificationType) == -1)

[Sebastian Noack, 2017/01/05 12:46:11]

Using indexOf() for membership checks seems unnecessary here. The following
seems much easier to read to me (and is also faster if it would matter):

 if (notificationType != "critical" && notificationType != "relentless")
   ...

Also note that arrays also have an includes() method which would still be better
than using indexOf(). Or you could use a Set and it's has() method, which would
be most appropriate if you have a container that you only use for membership
checks. Though for simplicity, I'd prefer to use simple comparision logic here,
as indicated above.

[wspee, 2017/01/05 15:19:27]

Done.

     {
       buttons.push({
         type: "configure",
         title: ext.i18n.getMessage("notification_configure")
       });
     }
   }
 
   return buttons;
 }
@@ skipping 119 matching lines @@
         message += "\n\n" + ext.i18n.getMessage("notification_with_buttons");
 
       let approved = confirm(message);
       if (activeNotification.type == "question")
         notificationButtonClick(approved ? 0 : 1);
       else if (approved)
         openNotificationLinks();
     }
   }
   prepareNotificationIconAndPopup();
+
+  if (notification.type !== "question")

[Sebastian Noack, 2017/01/05 12:46:11]

As per the Mozilla coding style guide
(https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Coding_Style...)
which is referenced in our coding style guide
(https://adblockplus.org/coding-style#javascript), we prefer != over !==.

[wspee, 2017/01/05 15:19:27]

Done.

+    NotificationStorage.markAsShown(notification.id);
 };
 
 /**
  * Initializes the notification system.
  */
 exports.initNotifications = function()
 {
   if (canUseChromeNotifications)
     initChromeNotifications();
   initAntiAdblockNotification();
@@ skipping 23 matching lines @@
   let methods = displayMethods[notificationType] || defaultDisplayMethods;
   return methods.indexOf(method) > -1;
 };
 
 ext.pages.onLoading.addListener(page =>
 {
   NotificationStorage.showNext(stringifyURL(page.url));
 });
 
 NotificationStorage.addShowListener(showNotification);