Relocated icon and redesigned icon popup

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/>.
  */
 
 (function()
 {
-  var backgroundPage = chrome.extension.getBackgroundPage();
+  var backgroundPage = ext.backgroundPage.getWindow();
   var require = backgroundPage.require;
   var getStats = require("stats").getStats;
   var FilterNotifier = require("filterNotifier").FilterNotifier;
   var Prefs = require("prefs").Prefs;
   
-  var currentTabId;
+  var currentTab;
   var shareURL = "https://adblockplus.org/";
   
   var messageMark = {};
   var shareLinks = {
     facebook: ["https://www.facebook.com/dialog/feed", {
       app_id: "475542399197328",
       link: shareURL,
       redirect_uri: "https://www.facebook.com/",
       ref: "adcounter",
       name: messageMark,
@@ skipping 26 matching lines @@
       if (value == messageMark)
         value = i18n.getMessage("stats_share_message", blockedCount);
       querystring.push(encodeURIComponent(key) + "=" + encodeURIComponent(value));
     }
     return url + "?" + querystring.join("&");
   }
   
   function onLoad()
   {
     document.getElementById("share-box").addEventListener("click", share, false);
-    document.getElementById("share").addEventListener("click", toggleShareBox, false);
     var showIconNumber = document.getElementById("show-iconnumber");
-    showIconNumber.setAttribute("aria-checked", Prefs.show_iconnumber);
+    showIconNumber.setAttribute("aria-checked", Prefs.show_statsinicon);
     showIconNumber.addEventListener("click", toggleIconNumber, false);
     document.querySelector("label[for='show-iconnumber']").addEventListener("click", toggleIconNumber, false);
     
     // Update stats
-    chrome.tabs.query({
-      active: true,
-      windowId: chrome.windows.WINDOW_ID_CURRENT
-    }, function(tabs)
+    ext.windows.getLastFocused(function(win)
     {
-      if (tabs.length > 0)
+      win.getActiveTab(function(tab)
       {
-        currentTabId = tabs[0].id;
+        currentTab = tab;
         updateStats();
-        
+
         FilterNotifier.addListener(onNotify);
-        
+
         document.getElementById("stats-container").removeAttribute("hidden");
-      }
+      });
     });
   }
   
   function onUnload()
   {
     FilterNotifier.removeListener(onNotify);
   }
   
   function onNotify(action, item)
   {
     if (action == "filter.hitCount")
       updateStats();
   }
   
   function updateStats()
   {
     var statsPage = document.getElementById("stats-page");
-    var blockedPage = getStats("blocked", currentTabId).toLocaleString();
+    var blockedPage = getStats("blocked", currentTab).toLocaleString();
     i18n.setElementText(statsPage, "stats_label_page", [blockedPage]);
     
     var statsTotal = document.getElementById("stats-total");
     var blockedTotal = getStats("blocked").toLocaleString();
     i18n.setElementText(statsTotal, "stats_label_total", [blockedTotal]);
-  }
-  
-  function toggleShareBox(ev)
-  {
-    var shareBox = document.getElementById("share-box");
-    shareBox.hidden = !shareBox.hidden;
   }
   
   function share(ev)
   {
     // Easter Egg
     var blocked = getStats("blocked");
     if (blocked <= 9000 || blocked >= 10000)
       blocked = blocked.toLocaleString();
     else
       blocked = i18n.getMessage("stats_over", (9000).toLocaleString());
     
     var url = createShareLink(ev.target.dataset.social, blocked);
-    chrome.tabs.create({url: url});
+    ext.windows.getLastFocused(function(win) { win.openTab(url); });
   }
   
   function toggleIconNumber()
   {
-    Prefs.show_iconnumber = !Prefs.show_iconnumber;
-    document.getElementById("show-iconnumber").setAttribute("aria-checked", Prefs.show_iconnumber);
+    Prefs.show_statsinicon = !Prefs.show_statsinicon;
+    document.getElementById("show-iconnumber").setAttribute("aria-checked", Prefs.show_statsinicon);
   }
   
   document.addEventListener("DOMContentLoaded", onLoad, false);
   window.addEventListener("unload", onUnload, false);
 })();