From 30024487f302befa8d6c99cfd912b3a697a0c54d Mon Sep 17 00:00:00 2001
From: Martynas Bagdonas <git.martynas@gmail.com>
Date: Thu, 31 Oct 2024 10:40:45 +0000
Subject: [PATCH] Work around contenteditable not updating Edit menu in reader
 and notes

This seems to be a Firefox bug that exists even in Firefox 132.0a1 (2024-09-29).
Note that right-clicking to open the context menu on a contenteditable element also triggers an update to the Edit menu.

The fix updates all Edit menu options except Redo, which cannot be enabled due to ProseMirror modifying the contenteditable state after each change.

Partial fix for #3398
---
 chrome/content/zotero/note.xhtml       | 3 ++-
 chrome/content/zotero/reader.xhtml     | 3 ++-
 chrome/content/zotero/zoteroPane.xhtml | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/note.xhtml b/chrome/content/zotero/note.xhtml
index beee6ca318..20fd6f7be3 100644
--- a/chrome/content/zotero/note.xhtml
+++ b/chrome/content/zotero/note.xhtml
@@ -85,7 +85,8 @@
 		</menu>
 
 		<menu id="edit-menu"  data-l10n-id="menu-edit">
-			<menupopup id="menu_EditPopup">
+			<!-- goUpdateGlobalEditMenuItems(true) is necessary to update Edit menu when contenteditable is focused -->
+			<menupopup id="menu_EditPopup" onpopupshowing="goUpdateGlobalEditMenuItems(true)">
 				<menuitem id="menu_undo"
 						  key="key_undo"
 						  command="cmd_undo" data-l10n-id="text-action-undo"/>
diff --git a/chrome/content/zotero/reader.xhtml b/chrome/content/zotero/reader.xhtml
index 47da34968f..2690ab12e4 100644
--- a/chrome/content/zotero/reader.xhtml
+++ b/chrome/content/zotero/reader.xhtml
@@ -113,7 +113,8 @@
 		</menu>
 
 		<menu id="edit-menu"  data-l10n-id="menu-edit">
-			<menupopup id="menu_EditPopup">
+			<!-- goUpdateGlobalEditMenuItems(true) is necessary to update Edit menu when contenteditable is focused -->
+			<menupopup id="menu_EditPopup" onpopupshowing="goUpdateGlobalEditMenuItems(true)">
 				<menuitem id="menu_undo"
 						  key="key_undo"
 						  command="cmd_undo" data-l10n-id="text-action-undo"/>
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 65efcbc705..4e759ed410 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -344,8 +344,9 @@
 					</menu>
 					
 					<menu id="edit-menu" data-l10n-id="menu-edit">
+						<!-- goUpdateGlobalEditMenuItems(true) is necessary to update Edit menu when contenteditable is focused -->
 						<menupopup id="menu_EditPopup"
-									onpopupshowing="ZoteroStandalone.updateQuickCopyOptions()">
+									onpopupshowing="ZoteroStandalone.updateQuickCopyOptions();goUpdateGlobalEditMenuItems(true)">
 							<menuitem id="menu_undo"
 									key="key_undo"
 									command="cmd_undo" data-l10n-id="text-action-undo"/>