Issue 3222 - Don`t do localization in the contentPolicy module

chrome/content/ui/sidebar.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
@@ skipping 16 matching lines @@
 var noFlash = false;
 
 // Matcher for disabled filters
 var disabledMatcher = new CombinedMatcher();
 
 // Cached string values
 var docDomainThirdParty = null;
 var docDomainFirstParty = null;
 
 // Localized type names
-var types = new Map();

[tschuster, 2015/11/05 15:06:15]

localizedTypes maybe?

[Wladimir Palant, 2015/11/05 15:47:11]

Done.

+var localizedTypes = new Map();
 
 function init() {
   docDomainThirdParty = document.documentElement.getAttribute("docDomainThirdParty");
   docDomainFirstParty = document.documentElement.getAttribute("docDomainFirstParty");
 
   var list = E("list");
   list.view = treeView;
 
   // Restore previous state
   var params = Utils.getParams();
@@ skipping 51 matching lines @@
   list.addEventListener("select", onSelectionChange, false);
 
   // Initialize data
   handleLocationChange();
 
   // Install a progress listener to catch location changes
   if (addBrowserLocationListener)
     addBrowserLocationListener(mainWin, handleLocationChange, true);
 
   for (let type of Policy.contentTypes)
-    types.set(type, Utils.getString("type_label_" + type.toLowerCase()));
+    localizedTypes.set(type, Utils.getString("type_label_" + type.toLowerCase()));
 }
 
 // To be called for a detached window when the main window has been closed
 function mainUnload() {
   parent.close();
 }
 
 // To be called on unload
 function cleanUp() {
   flasher.stop();
@@ skipping 137 matching lines @@
   E("tooltipFilterRow").hidden = !filter;
   E("tooltipFilterSourceRow").hidden = !subscriptions.length;
 
   if ("tooltip" in item)
     E("tooltipDummy").setAttribute("value", item.tooltip);
   else
   {
     E("tooltipAddress").parentNode.hidden = (item.typeDescr == "ELEMHIDE");
     setMultilineContent(E("tooltipAddress"), item.location);
 
-    var type = types.get(item.type);
+    var type = localizedTypes.get(item.type);
     if (filter && filter instanceof WhitelistFilter)
       type += " " + E("tooltipType").getAttribute("whitelisted");
     else if (filter && item.typeDescr != "ELEMHIDE")
       type += " " + E("tooltipType").getAttribute("filtered");
     E("tooltipType").setAttribute("value", type);
 
     if (size)
       E("tooltipSize").setAttribute("value", size.join(" x "));
 
     E("tooltipDocDomain").setAttribute("value", item.docDomain + " " + (item.thirdParty ? docDomainThirdParty : docDomainFirstParty));
@@ skipping 144 matching lines @@
   E("contextBlock").setAttribute("disabled", "filter" in item && item.filter && !item.filter.disabled);
   E("contextEditFilter").setAttribute("disabled", !("filter" in item && item.filter));
   E("contextOpen").setAttribute("disabled", "tooltip" in item || item.typeDescr == "ELEMHIDE");
   E("contextFlash").setAttribute("disabled", "tooltip" in item || !(item.typeDescr in visual) || (item.filter && !item.filter.disabled && !(item.filter instanceof WhitelistFilter)));
   E("contextCopyFilter").setAttribute("disabled", !allItems.some(function(item) {return "filter" in item && item.filter}));
 
   return true;
 }
 
 /**
- * Resets context menu data once the context menu is closed.
- */
-function clearContextMenu(/**Event*/ event)
-{
-  if (event.eventPhase != event.AT_TARGET)
-    return;
-
-  {
-    let menuItem = E("contextDisableOnSite");
-    menuItem.item = item;
-    menuItem.filter = filter;
-    menuItem.domain = domain;
-  }
-}
-
-/**
  * Processed mouse clicks on the item list.
  * @param {Event} event
  */
 function handleClick(event)
 {
   let item = treeView.getItemAt(event.clientX, event.clientY);
   if (event.button == 0 && treeView.getColumnAt(event.clientX, event.clientY) == "state")
   {
     if (item.filter)
       enableFilter(item.filter, item.filter.disabled);
@@ skipping 47 matching lines @@
 }
 
 function editFilter()
 {
   var item = treeView.getSelectedItem();
   if (treeView.data && !treeView.data.length)
     item = treeView.getDummyTooltip();
 
   if (!("filter" in item) || !item.filter)
     return;
-
-  if (!("location") in item)
-    item.location = undefined
 
   UI.openFiltersDialog(item.filter);
 }
 
 function enableFilter(filter, enable) {
   filter.disabled = !enable;
 
   treeView.boxObject.invalidate();
 }
 
@@ skipping 168 matching lines @@
     return 1;
   else
     return 0;
 }
 
 function sortByAddressDesc(item1, item2) {
   return -sortByAddress(item1, item2);
 }
 
 function compareType(item1, item2) {
-  let type1 = types.get(item1.type);
-  let type2 = types.get(item2.type);
+  let type1 = localizedTypes.get(item1.type);
+  let type2 = localizedTypes.get(item2.type);
   if (type1 < type2)
     return -1;
   else if (type1 > type2)
     return 1;
   else
     return 0;
 }
 
 function compareFilter(item1, item2) {
   var hasFilter1 = (item1.filter ? 1 : 0);
@@ skipping 148 matching lines @@
     return (this.data && this.data.length ? this.data.length : 1);
   },
   getCellText: function(row, col) {
     col = col.id;
     if (col != "type" && col != "address" && col != "filter" && col != "size" && col != "docDomain" && col != "filterSource")
       return "";
     if (this.data && this.data.length) {
       if (row >= this.data.length)
         return "";
       if (col == "type")
-        return types.get(this.data[row].type);
+        return localizedTypes.get(this.data[row].type);
       else if (col == "filter")
         return (this.data[row].filter ? this.data[row].filter.text : "");
       else if (col == "size")
       {
         let size = getItemSize(this.data[row]);
         return (size ? size.join(" x ") : "");
       }
       else if (col == "docDomain")
         return this.data[row].docDomain + " " + (this.data[row].thirdParty ? docDomainThirdParty : docDomainFirstParty);
       else if (col == "filterSource")
@@ skipping 294 matching lines @@
    * @return {Boolean} true if the item should be shown
    */
   matchesFilter: function(item)
   {
     if (!this.filter)
       return true;
 
     return (item.location.toLowerCase().indexOf(this.filter) >= 0 ||
             (item.filter && item.filter.text.toLowerCase().indexOf(this.filter) >= 0) ||
             item.typeDescr.toLowerCase().indexOf(this.filter.replace(/-/g, "_")) >= 0 ||
-            types.get(item.type).toLowerCase().indexOf(this.filter) >= 0 ||
+            localizedTypes.get(item.type).toLowerCase().indexOf(this.filter) >= 0 ||
             (item.docDomain && item.docDomain.toLowerCase().indexOf(this.filter) >= 0) ||
             (item.docDomain && item.thirdParty && docDomainThirdParty.toLowerCase().indexOf(this.filter) >= 0) ||
             (item.docDomain && !item.thirdParty && docDomainFirstParty.toLowerCase().indexOf(this.filter) >= 0));
   },
 
   setFilter: function(filter) {
     var oldRows = this.rowCount;
 
     this.filter = filter.toLowerCase();
     this.refilter();
@@ skipping 68 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }