Noissue - Merge current tip to Edge bookmark

notification.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 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";
 
-const {require} = ext.backgroundPage.getWindow();
-
 const {Utils} = require("utils");
 const {Notification} = require("notification");
 const {getActiveNotification, shouldDisplay} = require("notificationHelper");
 
 function getDocLinks(notification)
 {
   if (!notification.links)
     return [];
 
   let docLinks = [];
@@ skipping 53 matching lines @@
     event.preventDefault();
     event.stopPropagation();
     ext.pages.open(link.href);
   });
 
   let notificationElement = document.getElementById("notification");
   notificationElement.className = notification.type;
   notificationElement.hidden = false;
   notificationElement.addEventListener("click", event =>
   {
-    switch (event.target.id)
+    if (event.target.id == "notification-close")
+      notificationElement.classList.add("closing");
+    else if (event.target.id == "notification-optout" ||
+             event.target.id == "notification-hide")
     {
-      case "notification-close":
-        notificationElement.classList.add("closing");
-        break;
-      case "notification-optout":
+      if (event.target.id == "notification-optout")
         Notification.toggleIgnoreCategory("*", true);
-      case "notification-hide":
-        notificationElement.hidden = true;
-        notification.onClicked();
-        break;
+
+      notificationElement.hidden = true;
+      notification.onClicked();
     }
   }, true);
 }, false);