Issue 394 - hit statistics tool data collection

chrome/content/ui/filters.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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/>.
  */
 
-let {Prefs} = require("prefs");
-
 /**
  * Initialization function, called when the window is loaded.
  */
 function init()
 {
   if (window.arguments && window.arguments.length)
   {
     let filter = window.arguments[0].wrappedJSObject;
     if (filter instanceof Filter)
       Utils.runAsync(() => SubscriptionActions.selectFilter(filter));
   }
 
-  E("sendStats").hidden = !Prefs.savestats;
-  E("sendStats").getElementsByTagName("checkbox")[0].checked = Prefs.sendstats;

[Wladimir Palant, 2016/02/29 14:35:43]

Please don't access elements like that, they should have an ID unless there is a
very good reason why they cannot. If you need an ID attribute on the container
then you can add id="sendStats-container" on it but you should still access the
checkbox by its own ID rather than relying on the structure of the document.

[saroyanm, 2016/03/18 18:23:11]

Done.

+  E("sendStats-container").hidden = !Prefs.savestats;
+  E("sendStats").checked = Prefs.sendstats;
   Prefs.addListener(function(name)
   {
     if (name == "savestats")
-      E("sendStats").hidden = !Prefs[name];

[Wladimir Palant, 2016/02/29 14:35:43]

Nit: No point obfuscating this - just use Prefs.savestats instead of Prefs[name]
here.

Also, I think that you want to listen to the sendstats preference as well here
and update the checkbox accordingly (just in case the pref is changed from
elsewhere).

[saroyanm, 2016/03/18 18:23:11]

Done.

+      E("sendStats-container").hidden = !Prefs.savestats;
+    else if (name == "sendstats")
+      E("sendStats").checked = Prefs.sendstats;
   });
 }
 
 /**
  * Called whenever the currently selected tab changes.
  */
 function onTabChange(/**Element*/ tabbox)
 {
   updateSelectedSubscription();
 
@@ skipping 80 matching lines @@
   /**
    * Processes a template node using given data object.
    */
   process: function(/**Node*/ template, /**Object*/ data) /**Node*/
   {
     // Use a sandbox to resolve attributes (for convenience, not security)
     let sandbox = Cu.Sandbox(window);
     for (let key in data)
       sandbox[key] = data[key];
     sandbox.formatTime = Utils.formatTime;
+    sandbox.getSubscriptionTitle = getSubscriptionTitle;
 
     // Clone template but remove id/hidden attributes from it
     let result = template.cloneNode(true);
     result.removeAttribute("id");
     result.removeAttribute("hidden");
     result._data = data;
 
     // Resolve any attributes of the for attr="{obj.foo}"
     let conditionals = [];
     let nodeIterator = document.createNodeIterator(result, NodeFilter.SHOW_ELEMENT, null, false);
@@ skipping 87 matching lines @@
    * data object.
    */
   getNodeForData: function(/**Node*/ parent, /**String*/ property, /**Object*/ data) /**Node*/
   {
     for (let child = parent.firstChild; child; child = child.nextSibling)
       if ("_data" in child && property in child._data && child._data[property] == data)
         return child;
     return null;
   }
 };