Issue 3222 - Get rid of RequestEntry.typeDescr property

chrome/content/ui/composer.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 118 matching lines @@
   if (docDomain)
     docDomain = docDomain.replace(/^www\./i, "").replace(/\.+$/, "");
   if (docDomain)
     E("domainRestriction").value = docDomain;
 
   E("thirdParty").hidden = !thirdParty;
   E("firstParty").hidden = thirdParty;
 
   let typeGroup = E("typeGroup");
   let defaultTypes = RegExpFilter.prototype.contentType & ~RegExpFilter.typeMap.DOCUMENT;
-  let isDefaultType = (RegExpFilter.typeMap[item.typeDescr] & defaultTypes) != 0;
+  let isDefaultType = (RegExpFilter.typeMap[item.type] & defaultTypes) != 0;
   for (let [type, label] of types)
   {
     if (type == "ELEMHIDE")
       continue;
 
     let typeNode = document.createElement("checkbox");
     typeNode.setAttribute("value", type.toLowerCase().replace(/\_/g, "-"));
     typeNode.setAttribute("label", label);
 
     let typeMask = RegExpFilter.typeMap[type];
@@ skipping 96 matching lines @@
 
     if (options.length)
     {
       options.sort((a, b) => a[0] - b[0]);
       filter += "$" + options.map(o => o[1]).join(",");
     }
   }
   else
   {
     let defaultTypes = RegExpFilter.prototype.contentType & ~RegExpFilter.typeMap.DOCUMENT;
-    let isDefaultType = (RegExpFilter.typeMap[item.typeDescr] & defaultTypes) != 0;
+    let isDefaultType = (RegExpFilter.typeMap[item.type] & defaultTypes) != 0;
     if (!isDefaultType)
-      filter += "$" + item.typeDescr.toLowerCase().replace(/\_/g, "-");
+      filter += "$" + item.type.toLowerCase().replace(/\_/g, "-");
   }
 
   filter = Filter.normalize(filter);
   E("regexpWarning").hidden = !Filter.regexpRegExp.test(filter);
 
   let isSlow = false;
   let compiledFilter = Filter.fromText(filter);
   if (E("regexpWarning").hidden)
   {
     if (compiledFilter instanceof RegExpFilter && defaultMatcher.isSlowFilter(compiledFilter))
       isSlow = true;
   }
   E("shortpatternWarning").hidden = !isSlow;
 
-  E("matchWarning").hidden = compiledFilter instanceof RegExpFilter && compiledFilter.matches(item.location, RegExpFilter.typeMap[item.typeDescr], item.docDomain, item.thirdParty);
+  E("matchWarning").hidden = compiledFilter instanceof RegExpFilter && compiledFilter.matches(item.location, RegExpFilter.typeMap[item.type], item.docDomain, item.thirdParty);
 
   E("filter").value = filter;
 }
 
 function generateLinkText(element, replacement)
 {
   let template = element.getAttribute("textTemplate");
   if (typeof replacement != "undefined")
     template = template.replace(/\?1\?/g, replacement)
 
@@ skipping 18 matching lines @@
     pattern = E("customPattern").value;
   }
   else
   {
     E("anchorStart").checked = true;
     E("anchorEnd").checked = false;
   }
 
   function testFilter(/**String*/ filter) /**Boolean*/
   {
-    return RegExpFilter.fromText(filter + "$" + item.typeDescr).matches(item.location, RegExpFilter.typeMap[item.typeDescr], item.docDomain, item.thirdParty);
+    return RegExpFilter.fromText(filter + "$" + item.type).matches(item.location, RegExpFilter.typeMap[item.type], item.docDomain, item.thirdParty);
   }
 
   let anchorStartCheckbox = E("anchorStart");
   if (!/^\*/.test(pattern) && testFilter("||" + pattern))
   {
     disableElement(anchorStartCheckbox, false, "checked", false);
     [anchorStartCheckbox.label, anchorStartCheckbox.accessKey] = Utils.splitLabel(anchorStartCheckbox.getAttribute("labelFlexible"));
     anchorStartCheckbox.flexibleAnchor = true;
   }
   else
@@ skipping 71 matching lines @@
  * Selects or unselects all type checkboxes except those
  * that are disabled.
  */
 function selectAllTypes(/**Boolean*/ select)
 {
   for (let typeNode = E("typeGroup").firstChild; typeNode; typeNode = typeNode.nextSibling)
     if (typeNode.getAttribute("disabled") != "true")
       typeNode.checked = select;
   updateFilter();
 }