Issue 5593 - Use messaging in popup for prefs, whitelisting, and stats

stats.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/>.
  */
 
-/* global i18n */
+/* global i18n, getPref, togglePref */
 
 "use strict";
 
 (function()
 {
   const {require} = ext.backgroundPage.getWindow();
 
-  const {getBlockedPerPage} = require("stats");
   const {FilterNotifier} = require("filterNotifier");
 
-  let currentPage;
+  let currentTab;
   const shareURL = "https://adblockplus.org/";
 
   let messageMark = {};
   let shareLinks = {
     facebook: ["https://www.facebook.com/dialog/feed", {
       app_id: "475542399197328",
       link: shareURL,
       redirect_uri: "https://www.facebook.com/",
       ref: "adcounter",
       name: messageMark,
@@ skipping 30 matching lines @@
       );
     }
     return url + "?" + querystring.join("&");
   }
 
   function onLoad()
   {
     document.getElementById("share-box").addEventListener("click", share,
                                                           false);
     let showIconNumber = document.getElementById("show-iconnumber");
-    ext.prefs.get("show_statsinicon", showStatsInIcon =>
+    getPref("show_statsinicon", showStatsInIcon =>
     {
       showIconNumber.setAttribute("aria-checked", showStatsInIcon);
     });
     showIconNumber.addEventListener("click", toggleIconNumber, false);
     document.querySelector("label[for='show-iconnumber']").addEventListener(
       "click", toggleIconNumber, false
     );
 
     // Update stats
-    ext.pages.query({active: true, lastFocusedWindow: true}, pages =>
+    chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs =>
     {
-      currentPage = pages[0];
+      currentTab = tabs[0];
       updateStats();
 
       FilterNotifier.on("filter.hitCount", updateStats);
 
       document.getElementById("stats-container").removeAttribute("hidden");
     });
   }
 
   function onUnload()
   {
     FilterNotifier.off("filter.hitCount", updateStats);
   }
 
   function updateStats()
   {
     let statsPage = document.getElementById("stats-page");
-    let blockedPage = getBlockedPerPage(currentPage).toLocaleString();
-    i18n.setElementText(statsPage, "stats_label_page", [blockedPage]);
+    chrome.runtime.sendMessage({
+      type: "stats.getBlockedPerPage",
+      tab: currentTab
+    },
+    blockedPage =>
+    {
+      i18n.setElementText(statsPage, "stats_label_page",
+                          [blockedPage.toLocaleString()]);
+    });
 
     let statsTotal = document.getElementById("stats-total");
-    ext.prefs.get("blocked_total", blockedTotal =>
+    getPref("blocked_total", blockedTotal =>
     {
       i18n.setElementText(statsTotal, "stats_label_total",
                           [blockedTotal.toLocaleString()]);
     });
   }
 
   function share(ev)
   {
-    ext.prefs.get("blocked_total", blockedTotal =>
+    getPref("blocked_total", blockedTotal =>
     {
       // Easter Egg
       if (blockedTotal <= 9000 || blockedTotal >= 10000)
         blockedTotal = blockedTotal.toLocaleString();
       else
         blockedTotal = i18n.getMessage("stats_over", (9000).toLocaleString());
 
       ext.pages.open(createShareLink(ev.target.dataset.social, blockedTotal));

[Manish Jethani, 2017/09/27 09:42:32]

Sorry, I forgot this one.

     });
   }
 
   function toggleIconNumber()
   {
-    ext.prefs.toggle("show_statsinicon", () =>
+    togglePref("show_statsinicon", showStatsInIcon =>
     {
-      ext.prefs.get("show_statsinicon", showStatsInIcon =>

[Manish Jethani, 2017/09/01 15:56:20]

Calling prefs.get here to get the new value should not be necessary. I'd like to
make prefs.toggle return the new value, see 29533613. If we leave it this way
there's a noticeable delay in the UI update.

-      {
-        document.getElementById("show-iconnumber").setAttribute(
-          "aria-checked", showStatsInIcon
-        );
-      });
+      document.getElementById("show-iconnumber").setAttribute(
+        "aria-checked", showStatsInIcon
+      );
     });
   }
 
   document.addEventListener("DOMContentLoaded", onLoad, false);
   window.addEventListener("unload", onUnload, false);
 }());