Issue 2567 - Simplified stats data structure, fixed regression resetting ad counter

stats.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 = ext.backgroundPage.getWindow();
   var require = backgroundPage.require;
-  var getStats = require("stats").getStats;
+  var getBlockedPerPage = require("stats").getBlockedPerPage;
   var FilterNotifier = require("filterNotifier").FilterNotifier;
   var Prefs = require("prefs").Prefs;
   
   var currentPage;
   var shareURL = "https://adblockplus.org/";
   
   var messageMark = {};
   var shareLinks = {
     facebook: ["https://www.facebook.com/dialog/feed", {
       app_id: "475542399197328",
@@ skipping 61 matching lines @@
   
   function onNotify(action, item)
   {
     if (action == "filter.hitCount")
       updateStats();
   }
   
   function updateStats()
   {
     var statsPage = document.getElementById("stats-page");
-    var blockedPage = getStats("blocked", currentPage).toLocaleString();
+    var blockedPage = getBlockedPerPage(currentPage).toLocaleString();
     i18n.setElementText(statsPage, "stats_label_page", [blockedPage]);
     
     var statsTotal = document.getElementById("stats-total");
-    var blockedTotal = getStats("blocked").toLocaleString();
+    var blockedTotal = Prefs.blocked_total.toLocaleString();
     i18n.setElementText(statsTotal, "stats_label_total", [blockedTotal]);
   }
   
   function share(ev)
   {
     // Easter Egg
-    var blocked = getStats("blocked");
+    var blocked = Prefs.blocked_total;
     if (blocked <= 9000 || blocked >= 10000)
       blocked = blocked.toLocaleString();
     else
       blocked = i18n.getMessage("stats_over", (9000).toLocaleString());
     
     ext.pages.open(createShareLink(ev.target.dataset.social, blocked));
   }
   
   function toggleIconNumber()
   {
     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);
 })();