Issue 4795 - Use modern JavaScript syntax

notification.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
  * 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/>.
  */
 
 "use strict";
 
-let backgroundPage = ext.backgroundPage.getWindow();
-let require = backgroundPage.require;
+const {require} = ext.backgroundPage.getWindow();
 
-let Utils = require("utils").Utils;

[Sebastian Noack, 2017/01/16 15:35:56]

I suppose we could better use destructuring here now?

[kzar, 2017/01/17 07:42:49]

Done.

-let Notification = require("notification").Notification;
-let notificationHelper = require("notificationHelper");
-let getActiveNotification = notificationHelper.getActiveNotification;
-let shouldDisplayNotification = notificationHelper.shouldDisplay;
+const {Utils} = require("utils");
+const {Notification} = require("notification");
+const {getActiveNotification, shouldDisplay} = require("notificationHelper");
 
 function getDocLinks(notification)
 {
   if (!notification.links)
     return [];
 
   let docLinks = [];
   notification.links.forEach(link =>
   {
     docLinks.push(Utils.getDocLink(link));
@@ skipping 22 matching lines @@
     newElement.href = links.shift();
   insertMessage(newElement, value, links);
   element.appendChild(newElement);
 
   insertMessage(element, after, links);
 }
 
 window.addEventListener("load", () =>
 {
   let notification = getActiveNotification();
-  if (!notification || !shouldDisplayNotification("popup", notification.type))
+  if (!notification || !shouldDisplay("popup", notification.type))
     return;
 
   let texts = Notification.getLocalizedTexts(notification);
   let titleElement = document.getElementById("notification-title");
   titleElement.textContent = texts.title;
 
   let docLinks = getDocLinks(notification);
   let messageElement = document.getElementById("notification-message");
   insertMessage(messageElement, texts.message, docLinks);
 
@@ skipping 21 matching lines @@
         break;
       case "notification-optout":
         Notification.toggleIgnoreCategory("*", true);
       case "notification-hide":
         notificationElement.hidden = true;
         notification.onClicked();
         break;
     }
   }, true);
 }, false);