Noissue - Merge current tip to Edge bookmark

popup.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.
  *
@@ skipping 28 matching lines @@
       document.body.classList.add("nohtml");
       require("messaging").getPort(window).on(
         "composer.ready", (message, sender) =>
         {
           if (sender.page.id == page.id)
             document.body.classList.remove("nohtml");
         }
       );
     }
 
-    // Ask content script whether clickhide is active. If so, show cancel button.
-    // If that isn't the case, ask background.html whether it has cached filters. If so,
-    // ask the user whether she wants those filters.
-    // Otherwise, we are in default state.
+    // Ask content script whether clickhide is active. If so, show
+    // cancel button.  If that isn't the case, ask background.html
+    // whether it has cached filters. If so, ask the user whether she
+    // wants those filters. Otherwise, we are in default state.
     if (page)
     {
       if (checkWhitelisted(page))
         document.body.classList.add("disabled");
 
       page.sendMessage({type: "composer.content.getState"}, response =>
       {
         if (response && response.active)
           document.body.classList.add("clickhide-active");
       });
     }
   });
 
-  document.getElementById("enabled").addEventListener("click", toggleEnabled, false);
-  document.getElementById("clickhide").addEventListener("click", activateClickHide, false);
-  document.getElementById("clickhide-cancel").addEventListener("click", cancelClickHide, false);
+  document.getElementById("enabled").addEventListener(
+    "click", toggleEnabled, false
+  );
+  document.getElementById("clickhide").addEventListener(
+    "click", activateClickHide, false
+  );
+  document.getElementById("clickhide-cancel").addEventListener(
+    "click", cancelClickHide, false
+  );
   document.getElementById("options").addEventListener("click", () =>
   {
     ext.showOptions();
   }, false);
 
   // Set up collapsing of menu items
   for (let collapser of document.getElementsByClassName("collapse"))
   {
     collapser.addEventListener("click", toggleCollapse, false);
     if (!Prefs[collapser.dataset.option])
-      document.getElementById(collapser.dataset.collapsable).classList.add("collapsed");
+    {
+      document.getElementById(
+        collapser.dataset.collapsable
+      ).classList.add("collapsed");
+    }
   }
 }
 
 function toggleEnabled()
 {
   let disabled = document.body.classList.toggle("disabled");
   if (disabled)
   {
     let host = getDecodedHostname(page.url).replace(/^www\./, "");
     let filter = Filter.fromText("@@||" + host + "^$document");
@@ skipping 40 matching lines @@
 }
 
 function toggleCollapse(event)
 {
   let collapser = event.currentTarget;
   Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option];
   collapser.parentNode.classList.toggle("collapsed");
 }
 
 document.addEventListener("DOMContentLoaded", onLoad, false);