Issue 6679 - Don't show block stats in icon if disabled

lib/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
@@ skipping 18 matching lines @@
 
 let getBlockedPerPage =
 /**
  * Gets the number of requests blocked on the given page.
  *
  * @param  {Page} page
  * @return {Number}
  */
 exports.getBlockedPerPage = page => blockedPerPage.get(page) || 0;
 
+function updateBadge(page, blockedCount)
+{
+  if (Prefs.show_statsinicon)
+  {
+    page.browserAction.setBadge(blockedCount && {
+      color: badgeColor,
+      number: blockedCount
+    });
+  }
+}
+
 // Once nagivation for the tab has been committed to (e.g. it's no longer
 // being prerendered) we clear its badge, or if some requests were already
 // blocked beforehand we display those on the badge now.
 browser.webNavigation.onCommitted.addListener(details =>
 {
   if (details.frameId == 0)
   {
     let page = new ext.Page({id: details.tabId});
     let blocked = blockedPerPage.get(page);
 
-    if (Prefs.show_statsinicon)

[Thomas Greiner, 2018/05/18 10:50:18]

What about moving this entire if-statement into a separate function so that we
don't have to worry about checking the preference at every part in this file
where we update the icon badge?

e.g. updateBadge(blocked)

[kzar, 2018/05/18 12:25:30]

Sure, I can do it that way if you like. Done.

-    {
-      page.browserAction.setBadge(blocked && {
-        color: badgeColor,
-        number: blocked
-      });
-    }
+    updateBadge(page, blocked);
   }
 });
 
 FilterNotifier.on("filter.hitCount", (filter, newValue, oldValue, tabIds) =>
 {
   if (!(filter instanceof BlockingFilter))
     return;
 
   for (let tabId of tabIds)
   {
     let page = new ext.Page({id: tabId});
     let blocked = blockedPerPage.get(page) || 0;
+
     blockedPerPage.set(page, ++blocked);
-
-    // Update number in icon
-    if (Prefs.show_statsinicon)
-    {
-      page.browserAction.setBadge({
-        color: badgeColor,
-        number: blocked
-      });
-    }
+    updateBadge(page, blocked);
   }
 
   Prefs.blocked_total++;
 });
 
 Prefs.on("show_statsinicon", () =>
 {
   browser.tabs.query({}, tabs =>
   {
     for (let tab of tabs)
     {
       let page = new ext.Page(tab);
-      let badge = null;
 
       if (Prefs.show_statsinicon)
-      {
-        let blocked = blockedPerPage.get(page);
-        if (blocked)
-        {
-          badge = {
-            color: badgeColor,
-            number: blocked
-          };
-        }
-      }
-
-      page.browserAction.setBadge(badge);
+        updateBadge(page, blockedPerPage.get(page));
+      else
+        page.browserAction.setBadge(null);
     }
   });
 });
 
 port.on("stats.getBlockedPerPage",
         message => getBlockedPerPage(new ext.Page(message.tab)));