Issue 3222 - Get rid of RequestEntry.typeDescr property

lib/ui.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 1594 matching lines @@
       target = target.ownerDocument.elementFromPoint(Math.max(rect.left, 0), Math.max(rect.top, 0));
     }
 
     if (!target)
       return;
 
     let window = popup.ownerDocument.defaultView;
     let menuItems = [];
     let addMenuItem = function([node, nodeData])
     {
-      let type = nodeData.typeDescr.toLowerCase();
+      let type = nodeData.type.toLowerCase();
       if (type == "background")
       {
         type = "image";
         node = null;
       }
 
       let label = this.overlay.attributes[type + "contextlabel"];
       if (!label)
         return;
 
       let item = popup.ownerDocument.createElement("menuitem");
       item.setAttribute("label", label);
       item.setAttribute("class", "abp-contextmenuitem");
       item.addEventListener("command", this.blockItem.bind(this, window, node, nodeData), false);
       popup.appendChild(item);
 
       menuItems.push(item);
     }.bind(this);
 
     // Look up data that we have for the node
     let data = RequestNotifier.getDataForNode(target);
     let hadImage = false;
     if (data && !data[1].filter)
     {
       addMenuItem(data);
-      hadImage = (data[1].typeDescr == "IMAGE");
+      hadImage = (data[1].type == "IMAGE");
     }
 
     // Look for frame data
     let wnd = Utils.getWindow(target);
     if (wnd.frameElement)
     {
       let data = RequestNotifier.getDataForNode(wnd.frameElement, true);
       if (data && !data[1].filter)
         addMenuItem(data);
     }
@@ skipping 289 matching lines @@
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)],
   ["abp-command-toggleshownotifications", "command", Notification.toggleIgnoreCategory.bind(Notification, "*", null)]
 ];
 
 onShutdown.add(function()
 {
   for (let window of UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });