Issue 3222 - Get rid of RequestEntry.typeDescr property

chrome/content/ui/sendReport.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 183 matching lines @@
   collectData: function(wnd, windowURI, callback)
   {
     this.callback = callback;
     this.requestNotifier = new RequestNotifier(wnd, this.onRequestFound, this);
   },
 
   onRequestFound: function(frame, node, entry, scanComplete)
   {
     if (entry)
     {
-      let key = entry.location + " " + entry.typeDescr + " " + entry.docDomain;
+      let key = entry.location + " " + entry.type + " " + entry.docDomain;
       let requestXML;
       if (key in this.nodeByKey)
       {
         requestXML = this.nodeByKey[key];
         requestXML.setAttribute("count", parseInt(requestXML.getAttribute("count"), 10) + 1);
       }
       else
       {
         requestXML = this.nodeByKey[key] = appendElement(this.requests, "request", {
           location: censorURL(entry.location),
-          type: entry.typeDescr,
+          type: entry.type,
           docDomain: entry.docDomain,
           thirdParty: entry.thirdParty,
           count: 1
         });
       }
 
       // Location is meaningless for element hiding hits
       if (entry.filter && entry.filter instanceof ElemHideBase)
         requestXML.removeAttribute("location");
 
@@ skipping 694 matching lines @@
           if (filter instanceof BlockingFilter && filter.disabled)
             disabledMatcher.add(filter);
       }
 
       let seenFilters = Object.create(null);
       for (let request of requestsDataSource.origRequests)
       {
         if (request.filter)
           continue;
 
-        let filter = disabledMatcher.matchesAny(request.location, RegExpFilter.typeMap[request.typeDescr], request.docDomain, request.thirdParty);
+        let filter = disabledMatcher.matchesAny(request.location, RegExpFilter.typeMap[request.type], request.docDomain, request.thirdParty);
         if (filter && !(filter.text in seenFilters))
         {
           this.disabledFilters.push(filter);
           seenFilters[filter.text] = true;
         }
       }
 
       // Find disabled subscriptions with filters matching any of the requests
       let seenSubscriptions = Object.create(null);
       for (let subscription of FilterStorage.subscriptions)
       {
         if (!subscription.disabled)
           continue;
 
         disabledMatcher.clear();
         for (let filter of subscription.filters)
           if (filter instanceof BlockingFilter)
             disabledMatcher.add(filter);
 
         for (let request of requestsDataSource.origRequests)
         {
           if (request.filter)
             continue;
 
-          let filter = disabledMatcher.matchesAny(request.location, RegExpFilter.typeMap[request.typeDescr], request.docDomain, request.thirdParty);
+          let filter = disabledMatcher.matchesAny(request.location, RegExpFilter.typeMap[request.type], request.docDomain, request.thirdParty);
           if (filter && !(subscription.url in seenSubscriptions))
           {
             this.disabledSubscriptions.push(subscription);
             seenSubscriptions[subscription.text] = true;
             break;
           }
         }
       }
 
       this.numSubscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter).length;
@@ skipping 611 matching lines @@
 
 function censorURL(url)
 {
   return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
 }
 
 function encodeHTML(str)
 {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }