Relocated icon and redesigned icon popup

lib/stats.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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/>.
  */
 
 /**
  * @fileOverview Provides usage stats
  */
 
 let {Prefs} = require("prefs");
 let {BlockingFilter} = require("filterClasses");
 let {FilterNotifier} = require("filterNotifier");
 
-let badgeColor = [100, 100, 100, 255];
+let badgeColor = "#646464";
 
 /**
  * Get statistics for specified tab
  * @param  {String} key   field key
  * @param  {Number} tabId tab ID (leave undefined for total stats)
  * @return {Number}       field value
  */
-let getStats = exports.getStats = function getStats(key, tabId)
+let getStats = exports.getStats = function getStats(key, tab)
 {
-  if (tabId)
-  {
-    let frameData = getFrameData(tabId, 0);
-    return (frameData && key in frameData ? frameData[key] : 0);
-  }
-  else
+  if (!tab)
     return (key in Prefs.stats_total ? Prefs.stats_total[key] : 0);
+
+  let frameData = getFrameData(tab, 0);
+  return (frameData && key in frameData ? frameData[key] : 0);
 };
 
-FilterNotifier.addListener(function(action, item, newValue, oldValue, tabId)
+FilterNotifier.addListener(function(action, item, newValue, oldValue, tab)
 {
   if (action != "filter.hitCount")
     return;
   
   let blocked = item instanceof BlockingFilter;
   
   // Increment counts
   if (blocked)
   {
     if ("blocked" in Prefs.stats_total)
       Prefs.stats_total.blocked++;
     else
       Prefs.stats_total.blocked = 1;
     Prefs.stats_total = Prefs.stats_total;
     
-    let frameData = getFrameData(tabId, 0);
+    let frameData = getFrameData(tab, 0);
     if (frameData)
     {
       if ("blocked" in frameData)
         frameData.blocked++;
       else
         frameData.blocked = 1;
     }
     
     // Update number in icon
-    if (Prefs.show_iconnumber)
+    if (Prefs.show_statsinicon)
     {
-      chrome.browserAction.setBadgeBackgroundColor({
-        color: badgeColor
-      });
-      
-      chrome.browserAction.setBadgeText({
-        tabId: tabId,
-        text: frameData.blocked.toString()
+      tab.browserAction.setBadge({
+        color: badgeColor,
+        number: frameData.blocked
       });
     }
   }
 });
 
 /**
  * Execute function for each tab in any window
  * @param  {Function} func function to be executed

[Felix Dahlke, 2013/12/13 13:57:20]

s/  / / s'il vous plaît.

  */
-
 function forEachTab(func)
 {
-  chrome.windows.getAll(function(windows)
+  ext.windows.getAll(function(windows)
   {
-    for (let i = 0; i < windows.length; i++)
+    for each (let window in windows)
     {
-      chrome.tabs.query({
-        windowId: windows[i].id
-      }, function(tabs)
+      window.getAllTabs(function(tabs)
       {
         for (let i = 0; i < tabs.length; i++)
           func(tabs[i]);
       });
     }
   });
 }
 
 Prefs.addListener(function(name)
 {
-  if (name != "show_iconnumber")
+  if (name != "show_statsinicon")
     return;
   
-  if (Prefs.show_iconnumber)
+  forEachTab(function(tab)
   {
-    // Add number to icon
-    chrome.browserAction.setBadgeBackgroundColor({
-      color: badgeColor
-    });
-    
-    forEachTab(function(tab) {
-      let frameData = getFrameData(tab.id, 0);
-      if (!frameData || !("blocked" in frameData))
-        return;
-      
-      chrome.browserAction.setBadgeText({
-        tabId: tab.id,
-        text: frameData.blocked.toString()
-      });
-    });
-  }
-  else
-  {
-    // Remove number from icon
-    forEachTab(function(tab)
+    let badge = null;
+    if (Prefs.show_statsinicon)
     {
-      chrome.browserAction.setBadgeText({
-        tabId: tab.id,
-        text: ""
-      });
-    });
-  }
+      let frameData = getFrameData(tab, 0);
+      if (frameData && "blocked" in frameData)
+      {
+        badge = {
+          color: badgeColor,
+          number: frameData.blocked
+        };
+      }
+    }
+    tab.browserAction.setBadge(badge);
+  });
 });