Issue 5593 - Merge notification.js and stats.js into popup.js

popup.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/>.
  */
 
 "use strict";
 
 const shareURL = "https://adblockplus.org/";

[Manish Jethani, 2017/10/10 05:08:56]

These from stats.js are now constants here.

 const messageMark = {};
 
 const shareLinks = {
   facebook: ["https://www.facebook.com/dialog/feed", {
     app_id: "475542399197328",
     link: shareURL,
     redirect_uri: "https://www.facebook.com/",
     ref: "adcounter",
     name: messageMark,
     actions: JSON.stringify([
@@ skipping 98 matching lines @@
 }
 
 function toggleCollapse(event)
 {
   let collapser = event.currentTarget;
   let collapsible = document.getElementById(collapser.dataset.collapsible);
   collapsible.classList.toggle("collapsed");
   togglePref(collapser.dataset.option);
 }
 
 function getDocLinks(notification)

[Manish Jethani, 2017/10/10 05:08:56]

This is from notification.js

 {
   if (!notification.links)
     return Promise.resolve([]);
 
   return Promise.all(
     notification.links.map(link =>
     {
       return new Promise((resolve, reject) =>
       {
         chrome.runtime.sendMessage({
@@ skipping 24 matching lines @@
 
   let newElement = document.createElement(tagName);
   if (tagName == "a" && links && links.length)
     newElement.href = links.shift();
   insertMessage(newElement, value, links);
   element.appendChild(newElement);
 
   insertMessage(element, after, links);
 }
 
 function createShareLink(network, blockedCount)

[Manish Jethani, 2017/10/10 05:08:56]

This is from stats.js

 {
   let url = shareLinks[network][0];
   let params = shareLinks[network][1];
 
   let querystring = [];
   for (let key in params)
   {
     let value = params[key];
     if (value == messageMark)
       value = chrome.i18n.getMessage("stats_share_message", blockedCount);
@@ skipping 18 matching lines @@
   });
 
   let statsTotal = document.getElementById("stats-total");
   getPref("blocked_total", blockedTotal =>
   {
     ext.i18n.setElementText(statsTotal, "stats_label_total",
                             [blockedTotal.toLocaleString()]);
   });
 }
 
-function share(ev)
+function share(event)
 {
   getPref("blocked_total", blockedTotal =>
   {
     // Easter Egg
     if (blockedTotal <= 9000 || blockedTotal >= 10000)
     {
       blockedTotal = blockedTotal.toLocaleString();
     }
     else
     {
       blockedTotal = chrome.i18n.getMessage("stats_over",
                                             (9000).toLocaleString());
     }
 
     chrome.tabs.create({
-      url: createShareLink(ev.target.dataset.social, blockedTotal)
+      url: createShareLink(event.target.dataset.social, blockedTotal)
     });
   });
 }
 
 function toggleIconNumber()
 {
   togglePref("show_statsinicon", showStatsInIcon =>
   {
     document.getElementById("show-iconnumber").setAttribute(
       "aria-checked", showStatsInIcon
@@ skipping 39 matching lines @@
       chrome.tabs.sendMessage(tab.id, {
         type: "composer.content.getState"
       },
       response =>
       {
         if (response && response.active)
           document.body.classList.add("clickhide-active");
       });
     }
 
     updateStats();

[Manish Jethani, 2017/10/10 05:08:56]

These two lines from the previously separate onLoad from stats.js

     document.getElementById("stats-container").removeAttribute("hidden");
   });
 
   document.getElementById("enabled").addEventListener(
-    "click", toggleEnabled, false
+    "click", toggleEnabled
   );
   document.getElementById("clickhide").addEventListener(
-    "click", activateClickHide, false
+    "click", activateClickHide
   );
   document.getElementById("clickhide-cancel").addEventListener(
-    "click", cancelClickHide, false
+    "click", cancelClickHide
   );
   document.getElementById("options").addEventListener("click", () =>
   {
     chrome.runtime.sendMessage({type: "app.open", what: "options"});
     window.close();
-  }, false);
+  });
 
   // Set up collapsing of menu items
   for (let collapser of document.getElementsByClassName("collapse"))
   {
-    collapser.addEventListener("click", toggleCollapse, false);
+    collapser.addEventListener("click", toggleCollapse);
     getPref(collapser.dataset.option, value =>
     {
       if (value)
       {
         document.getElementById(
           collapser.dataset.collapsible
         ).classList.remove("collapsed");
       }
     });
   }
 
-  document.getElementById("share-box").addEventListener("click", share,

[Manish Jethani, 2017/10/10 05:08:56]

onLoad code from stats.js

-                                                        false);
+  document.getElementById("share-box").addEventListener("click", share);
   let showIconNumber = document.getElementById("show-iconnumber");
   getPref("show_statsinicon", showStatsInIcon =>
   {
     showIconNumber.setAttribute("aria-checked", showStatsInIcon);
   });
-  showIconNumber.addEventListener("click", toggleIconNumber, false);
+  showIconNumber.addEventListener("click", toggleIconNumber);
   document.querySelector("label[for='show-iconnumber']").addEventListener(
-    "click", toggleIconNumber, false
-  );
-}, false);
+    "click", toggleIconNumber
+  );
+});
 
 window.addEventListener("load", () =>

[Manish Jethani, 2017/10/10 05:08:56]

Nothing has changed in the window's "load" handler.

 {
   chrome.runtime.sendMessage({
     type: "notifications.get",
     displayMethod: "popup"
   }, notification =>
   {
     if (!notification)
       return;
 
     let titleElement = document.getElementById("notification-title");
@@ skipping 29 matching lines @@
                event.target.id == "notification-hide")
       {
         if (event.target.id == "notification-optout")
           setPref("notifications_ignoredcategories", true);
 
         notificationElement.hidden = true;
         notification.onClicked();
       }
     }, true);
   });
-}, false);
+});