Issue 6948 - Begun simplifying the "block element" context menu logic

ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 57 matching lines @@
 
 
   /* Pages */
 
   let Page = ext.Page = function(tab)
   {
     this.id = tab.id;
     this._url = tab.url && new URL(tab.url);
 
     this.browserAction = new BrowserAction(tab.id);
-    this.contextMenus = new ContextMenus(this);
   };
   Page.prototype = {
     get url()
     {
       // usually our Page objects are created from Chrome's Tab objects, which
       // provide the url. So we can return the url given in the constructor.
       if (this._url)
         return this._url;
 
       // but sometimes we only have the tab id when we create a Page object.
@@ skipping 327 matching lines @@
         if ("number" in badge)
           this._addChange("badgeText", badge.number.toString());
 
         if ("color" in badge)
           this._addChange("badgeColor", badge.color);
       }
     }
   };
 
 
-  /* Context menus */
-
-  let contextMenuItems = new ext.PageMap();
-  let contextMenuUpdating = false;
-
-  let updateContextMenu = () =>
-  {
-    // Firefox for Android does not support context menus.
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=1269062
-    if (!("contextMenus" in browser) || contextMenuUpdating)
-      return;
-
-    contextMenuUpdating = true;
-
-    browser.tabs.query({active: true, lastFocusedWindow: true}, tabs =>
-    {
-      browser.contextMenus.removeAll(() =>
-      {
-        contextMenuUpdating = false;
-
-        if (tabs.length == 0)
-          return;
-
-        let items = contextMenuItems.get({id: tabs[0].id});
-
-        if (!items)
-          return;
-
-        items.forEach(item =>
-        {
-          browser.contextMenus.create({
-            title: item.title,
-            contexts: item.contexts,
-            onclick(info, tab)
-            {
-              item.onclick(new Page(tab));
-            }
-          });
-        });
-      });
-    });
-  };
-
-  let ContextMenus = function(page)
-  {
-    this._page = page;
-  };
-  ContextMenus.prototype = {
-    create(item)
-    {
-      let items = contextMenuItems.get(this._page);
-      if (!items)
-        contextMenuItems.set(this._page, items = []);
-
-      items.push(item);
-      updateContextMenu();
-    },
-    remove(item)
-    {
-      let items = contextMenuItems.get(this._page);
-      if (items)
-      {
-        let index = items.indexOf(item);
-        if (index != -1)
-        {
-          items.splice(index, 1);
-          updateContextMenu();
-        }
-      }
-    }
-  };
-
-  browser.tabs.onActivated.addListener(updateContextMenu);
-
-  if ("windows" in browser)
-  {
-    browser.windows.onFocusChanged.addListener(windowId =>
-    {
-      if (windowId != browser.windows.WINDOW_ID_NONE)
-        updateContextMenu();
-    });
-  }
-
-
   /* Web requests */
 
   let framesOfTabs = new Map();
 
   ext.getFrame = (tabId, frameId) =>
   {
     let frames = framesOfTabs.get(tabId);
     return frames && frames.get(frameId);
   };
 
@@ skipping 81 matching lines @@
           return frames.get(0) || null;
         }
       };
     }
 
     return ext.onMessage._dispatch(
       message, sender, sendResponse
     ).includes(true);
   });
 }