From 0717612b4bb8da7ea6103a7c0fa22246b79fbc54 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 5 Aug 2020 00:20:08 -0400
Subject: [PATCH] fx-compat: Remove contentAreaContextMenu menupopup

No longer necessary
---
 .../content/zotero/standalone/standalone.js   | 25 -----------------
 chrome/content/zotero/zoteroPane.xhtml        | 28 -------------------
 2 files changed, 53 deletions(-)

diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index ec182b38c4..dfb65cd2f6 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -955,30 +955,5 @@ function openUILinkIn(url) {
 	ZoteroPane.loadURI(url);
 }
 
-// Support context menus on HTML text boxes
-//
-// Adapted from editMenuOverlay.js in Fx68
-window.addEventListener("contextmenu", e => {
-	const HTML_NS = "http://www.w3.org/1999/xhtml";
-	let needsContextMenu =
-		e.target.ownerDocument == document &&
-		!e.defaultPrevented &&
-		e.target.parentNode.nodeName != "moz-input-box" &&
-		((["textarea", "input"].includes(e.target.localName) &&
-			e.target.namespaceURI == HTML_NS) ||
-			e.target.closest("search-textbox"));
-	
-	if (!needsContextMenu) {
-		return;
-	}
-	
-	let popup = document.getElementById("contentAreaContextMenu");
-	popup.openPopupAtScreen(e.screenX, e.screenY, true);
-	// Don't show any other context menu at the same time. There can be a
-	// context menu from an ancestor too but we only want to show this one.
-	e.preventDefault();
-});
-
-
 window.addEventListener("load", function(e) { ZoteroStandalone.onLoad(e); }, false);
 window.addEventListener("unload", function(e) { ZoteroStandalone.onUnload(e); }, false);
\ No newline at end of file
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 10be105b98..2e950d3cc8 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -117,34 +117,6 @@
 	</keyset>
 	<keyset id="editMenuKeys"/>
 	
-	<menupopup id="contentAreaContextMenu">
-		<menuitem id="context-undo"
-				label="&undoCmd.label;"
-				accesskey="&undoCmd.accesskey;"
-				command="cmd_undo"/>
-		<menuseparator id="context-sep-undo"/>
-		<menuitem id="context-cut"
-				label="&cutCmd.label;"
-				accesskey="&cutCmd.accesskey;"
-				command="cmd_cut"/>
-		<menuitem id="context-copy"
-				label="&copyCmd.label;"
-				accesskey="&copyCmd.accesskey;"
-				command="cmd_copy"/>
-		<menuitem id="context-paste"
-				label="&pasteCmd.label;"
-				accesskey="&pasteCmd.accesskey;"
-				command="cmd_paste"/>
-		<menuitem id="context-delete"
-				label="&deleteCmd.label;"
-				accesskey="&deleteCmd.accesskey;"
-				command="cmd_delete"/>
-		<menuseparator id="context-sep-paste"/>
-		<menuitem id="context-selectall"
-				label="&selectAllCmd.label;"
-				accesskey="&selectAllCmd.accesskey;"
-				command="cmd_selectAll"/>
-	</menupopup>
 	<vbox id="titlebar">
 		<hbox id="titlebar-buttonbox-container" skipintoolbarset="true">
 			<hbox id="titlebar-buttonbox">