From 236a617d06384b08167296afffeed1ec0cda15c4 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Sun, 11 Sep 2022 20:48:30 +1000
Subject: [PATCH] Bug 1790175 - Remove the Message menu item in the new App
 Menu. r=aleca

Differential Revision: https://phabricator.services.mozilla.com/D157026

--HG--
extra : amend_source : b536e8ba736b50ee8564546756a00c6b22cef202
---
 mail/base/content/hiddenWindowMac.js          |  18 --
 mail/base/content/mailWindowOverlay.js        |  81 -----
 .../customizableui/content/panelUI.inc.xhtml  | 304 ------------------
 .../customizableui/content/panelUI.js         |   9 +-
 mail/locales/en-US/messenger/messenger.ftl    |   3 -
 5 files changed, 1 insertion(+), 414 deletions(-)

diff --git a/mail/base/content/hiddenWindowMac.js b/mail/base/content/hiddenWindowMac.js
index b018e45c59..9a40f81687 100644
--- a/mail/base/content/hiddenWindowMac.js
+++ b/mail/base/content/hiddenWindowMac.js
@@ -86,10 +86,7 @@ function hiddenWindowStartup() {
     "filtersCmd",
     "cmd_close",
     "minimizeWindow",
-    "appmenu_markMenu",
     "zoomWindow",
-    "appmenu_replyMainMenu",
-    "appmenu_replyNewsgroupMainMenu",
     "appmenu_newFolder",
     "appmenu_newMailAccountMenuItem",
     "appmenu_close",
@@ -121,7 +118,6 @@ function hiddenWindowStartup() {
     "appmenu_viewHeadersMenu",
     "appmenu_find",
     "appmenu_viewAttachmentsInlineMenuitem",
-    "appmenu_replySenderMainMenu",
     "appmenu_nextMsg",
     "appmenu_nextUnreadMsg",
     "appmenu_nextUnreadThread",
@@ -131,22 +127,8 @@ function hiddenWindowStartup() {
     "appmenu_goForward",
     "appmenu_goBack",
     "appmenu_goStartPage",
-    "appmenu_newMsgCmd",
     "appmenu_viewFullZoomMenu",
-    "appmenu_replyToAll",
-    "appmenu_replyToList",
-    "appmenu_forwardMsg",
-    "appmenu_forwardAsMenu",
-    "appmenu_editMsgAsNew",
-    "appmenu_tagMenu",
-    "appmenu_moveToFolderAgain",
     "appmenu_openMessageWindowMenuitem",
-    "appmenu_openConversationMenuitem",
-    "appmenu_moveMenu",
-    "appmenu_copyMenu",
-    "appmenu_createFilter",
-    "appmenu_killThread",
-    "appmenu_killSubthread",
   ];
 
   let element;
diff --git a/mail/base/content/mailWindowOverlay.js b/mail/base/content/mailWindowOverlay.js
index 610fdf038d..3eb7b73a0a 100644
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -901,87 +901,6 @@ function InitMessageMenu() {
   document.commandDispatcher.updateCommands("create-menu-message");
 }
 
-function InitAppMessageMenu() {
-  let selectedMsg = gFolderDisplay.selectedMessage;
-  let isNews = gFolderDisplay.selectedMessageIsNews;
-  let isFeed = gFolderDisplay.selectedMessageIsFeed;
-
-  // We show reply to Newsgroups only for news messages.
-  document.getElementById("appmenu_replyNewsgroupMainMenu").hidden = !isNews;
-
-  // For mail messages we say reply. For news we say ReplyToSender.
-  document.getElementById("appmenu_replyMainMenu").hidden = isNews;
-  document.getElementById("appmenu_replySenderMainMenu").hidden = !isNews;
-
-  document.getElementById("appmenu_cancel").hidden = !isNews;
-
-  // Disable the move and copy menus if there are no messages selected or if
-  // the message is a dummy - e.g. opening a message in the standalone window.
-  let messageStoredInternally = selectedMsg && !gMessageDisplay.isDummy;
-  // Disable the move menu if we can't delete msgs from the folder.
-  let canMove =
-    messageStoredInternally && gFolderDisplay.canDeleteSelectedMessages;
-  document.getElementById("appmenu_moveMenu").disabled = !canMove;
-
-  // Also disable copy when no folder is loaded (like for .eml files).
-  let canCopy =
-    selectedMsg &&
-    (!gMessageDisplay.isDummy || window.arguments[0].scheme == "file");
-  document.getElementById("appmenu_copyMenu").disabled = !canCopy;
-
-  initMoveToFolderAgainMenu(
-    document.getElementById("appmenu_moveToFolderAgain")
-  );
-
-  // Disable the Forward As menu item if no message is selected.
-  document.getElementById("appmenu_forwardAsMenu").disabled = !selectedMsg;
-
-  // Disable the Tag menu item if no message is selected or when we're
-  // not in a folder.
-  document.getElementById(
-    "appmenu_tagMenu"
-  ).disabled = !messageStoredInternally;
-
-  // Show "Edit Draft Message" menus only in a drafts folder; otherwise hide them.
-  showCommandInSpecialFolder("cmd_editDraftMsg", Ci.nsMsgFolderFlags.Drafts);
-  // Show "New Message from Template" and "Edit Template" menus only in a
-  // templates folder; otherwise hide them.
-  showCommandInSpecialFolder(
-    ["cmd_newMsgFromTemplate", "cmd_editTemplateMsg"],
-    Ci.nsMsgFolderFlags.Templates
-  );
-
-  // Initialize the Open Message menuitem.
-  let winType = document.documentElement.getAttribute("windowtype");
-  if (winType == "mail:3pane") {
-    document.getElementById(
-      "appmenu_openMessageWindowMenuitem"
-    ).hidden = isFeed;
-  }
-
-  // Initialize the Open Feed Message handler menu.
-  const openFeedView = document
-    .getElementById("appMenu-messageOpenFeedView")
-    .querySelector(".panel-subview-body");
-
-  openFeedView.childNodes.forEach(node => node.removeAttribute("checked"));
-  openFeedView.childNodes[FeedMessageHandler.onOpenPref].setAttribute(
-    "checked",
-    true
-  );
-
-  let openRssMenu = document.getElementById("appmenu_openFeedMessage");
-  openRssMenu.hidden = !isFeed;
-  if (winType != "mail:3pane") {
-    openRssMenu.hidden = true;
-  }
-
-  // Disable mark menu when we're not in a folder.
-  document.getElementById("appmenu_markMenu").disabled =
-    gMessageDisplay.isDummy;
-  document.commandDispatcher.updateCommands("create-menu-message");
-}
-
 /**
  * Show folder-specific menu items only for messages in special folders, e.g.
  * show 'cmd_editDraftMsg' in Drafts folder, or
diff --git a/mail/components/customizableui/content/panelUI.inc.xhtml b/mail/components/customizableui/content/panelUI.inc.xhtml
index 09635c5db7..ffdc27aad7 100644
--- a/mail/components/customizableui/content/panelUI.inc.xhtml
+++ b/mail/components/customizableui/content/panelUI.inc.xhtml
@@ -110,17 +110,11 @@
                        label="&fileMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-fileView', this)"/>
-        <toolbarseparator/>
         <toolbarbutton id="appmenu_Go"
                        class="subviewbutton subviewbutton-nav"
                        label="&goMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-goView', this)"/>
-        <toolbarbutton id="appmenu_messageMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&msgMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-messageView', this)"/>
 #ifdef MAIN_WINDOW
         <toolbarbutton id="appmenu_Event_Task"
                        class="subviewbutton subviewbutton-nav hide-when-calendar-deactivated"
@@ -1146,304 +1140,6 @@
       <vbox class="panel-subview-body"/>
     </panelview>
 
-
-    <!-- Message -->
-    <panelview id="appMenu-messageView"
-               title="&msgMenu.label;"
-               class="PanelUI-subView">
-      <vbox class="panel-subview-body">
-        <toolbarbutton id="appmenu_newMsgCmd"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&newMsgCmd.label;"
-                       key="key_newMessage2"
-                       command="cmd_newMessage"/>
-        <toolbarbutton id="appmenu_replyMainMenu"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&replyMsgCmd.label;"
-                       key="key_reply"
-                       command="cmd_reply"/>
-        <toolbarbutton id="appmenu_replyNewsgroupMainMenu"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&replyNewsgroupCmd2.label;"
-                       key="key_reply"
-                       command="cmd_replyGroup"/>
-        <toolbarbutton id="appmenu_replySenderMainMenu"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&replySenderCmd.label;"
-                       command="cmd_replySender"/>
-        <toolbarbutton id="appmenu_replyToAll"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&replyToAllMsgCmd.label;"
-                       key="key_replyall"
-                       command="cmd_replyall"/>
-        <toolbarbutton id="appmenu_replyToList"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&replyToListMsgCmd.label;"
-                       key="key_replylist"
-                       command="cmd_replylist"/>
-        <toolbarbutton id="appmenu_forwardMsg"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&forwardMsgCmd.label;"
-                       key="key_forward"
-                       command="cmd_forward"/>
-        <toolbarbutton id="appmenu_forwardAsMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&forwardAsMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-messageForwardAsView', this)"/>
-        <toolbarbutton id="appmenu_redirectMsg"
-                       data-l10n-id="appmenu-redirect-msg"
-                       class="subviewbutton subviewbutton-iconic"
-                       command="cmd_redirect"/>
-        <toolbarbutton id="appmenu_editMsgAsNew"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&editAsNewMsgCmd.label;"
-                       key="key_editAsNew"
-                       command="cmd_editAsNew"/>
-        <toolbarbutton id="appmenu_editDraftMsg"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&editDraftMsgCmd.label;"
-                       command="cmd_editDraftMsg"/>
-        <toolbarbutton id="appmenu_newMsgFromTemplateCmd"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&newMsgFromTemplateCmd.label;"
-                       key="key_newMsgFromTemplate"
-                       command="cmd_newMsgFromTemplate"/>
-        <toolbarbutton id="appmenu_editTemplateMsgCmd"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&editTemplateMsgCmd.label;"
-                       command="cmd_editTemplateMsg"/>
-        <toolbarseparator id="appmenu_messageMenuAfterCompositionCommandsSeparator"/>
-        <toolbarbutton id="appmenu_openMessageWindowMenuitem"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&openMessageWindowCmd.label;"
-                       key="key_openMessage"
-                       command="cmd_openMessage"/>
-#ifdef MAIN_WINDOW
-        <toolbarbutton id="appmenu_openConversationMenuitem"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&openInConversationCmd.label;"
-                       key="key_openConversation"
-                       command="cmd_openConversation"/>
-#endif
-        <toolbarbutton id="appmenu_openFeedMessage"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&openFeedMessage1.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-messageOpenFeedView', this)"/>
-#ifdef MAIN_WINDOW
-        <toolbarseparator id="appmenu_messageAfterOpenMsgSeparator"/>
-#endif
-        <toolbarbutton id="appmenu_tagMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&tagMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-messageTagView', this)"/>
-        <toolbarbutton id="appmenu_markMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&markMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-messageMarkView', this)"/>
-        <toolbarseparator id="appmenu_messageMenuAfterMarkSeparator"/>
-        <toolbarbutton id="appmenu_archiveMainMenu"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&archiveMsgCmd.label;"
-                       key="key_archive"
-                       command="cmd_archive"/>
-        <toolbarbutton id="appmenu_cancel"
-                       class="subviewbutton subviewbutton-iconic"
-                       command="cmd_cancel"
-                       label="&cancelNewsMsgCmd.label;"/>
-        <toolbarbutton id="appmenu_moveMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&moveMsgToMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-messageMoveToView', this)"/>
-        <toolbarbutton id="appmenu_copyMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&copyMsgToMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-messageCopyToView', this)"/>
-        <toolbarbutton id="appmenu_moveToFolderAgain"
-                       class="subviewbutton subviewbutton-iconic"
-                       command="cmd_moveToFolderAgain"
-                       key="key_moveToFolderAgain"
-                       label="&moveToFolderAgain.label;"/>
-        <toolbarseparator id="appmenu_messageMenuAfterMoveCommandsSeparator"/>
-        <toolbarbutton id="appmenu_createFilter"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&createFilter.label;"
-                       command="cmd_createFilterFromMenu"/>
-        <toolbarseparator id="appmenu_threadItemsSeparator"/>
-        <toolbarbutton label="&killThreadMenu.label;"
-                       id="appmenu_killThread"
-                       class="subviewbutton subviewbutton-iconic"
-                       key="key_killThread"
-                       type="checkbox"
-                       command="cmd_killThread"/>
-        <toolbarbutton label="&killSubthreadMenu.label;"
-                       id="appmenu_killSubthread"
-                       class="subviewbutton subviewbutton-iconic"
-                       key="key_killSubthread"
-                       type="checkbox"
-                       command="cmd_killSubthread"/>
-        <toolbarbutton label="&watchThreadMenu.label;"
-                       id="appmenu_watchThread"
-                       class="subviewbutton subviewbutton-iconic"
-                       key="key_watchThread"
-                       type="checkbox"
-                       command="cmd_watchThread"/>
-      </vbox>
-    </panelview>
-
-    <!-- Message / Forward As -->
-    <panelview id="appMenu-messageForwardAsView"
-               title="&forwardAsMenu.label;"
-               class="PanelUI-subView">
-      <vbox class="panel-subview-body">
-        <toolbarbutton id="appmenu_forwardAsInline"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&forwardAsInline.label;"
-                       command="cmd_forwardInline"/>
-        <toolbarbutton id="appmenu_forwardAsAttachment"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&forwardAsAttachmentCmd.label;"
-                       command="cmd_forwardAttachment"/>
-      </vbox>
-    </panelview>
-
-    <!-- Message / When Opening Feed Messages -->
-    <panelview id="appMenu-messageOpenFeedView"
-               title="&openFeedMessage1.label;"
-               class="PanelUI-subView">
-      <vbox class="panel-subview-body">
-        <toolbarbutton id="appmenu_openFeedWebPage"
-                       class="subviewbutton subviewbutton-iconic"
-                       type="radio"
-                       name="openFeedGroup"
-                       label="&openFeedWebPage.label;"
-                       oncommand="FeedMessageHandler.onOpenPref = 0"/>
-        <toolbarbutton id="appmenu_openFeedSummary"
-                       class="subviewbutton subviewbutton-iconic"
-                       type="radio"
-                       name="openFeedGroup"
-                       label="&openFeedSummary.label;"
-                       oncommand="FeedMessageHandler.onOpenPref = 1"/>
-        <toolbarbutton id="appmenu_openFeedWebPageInMessagePane"
-                       class="subviewbutton subviewbutton-iconic"
-                       type="radio"
-                       name="openFeedGroup"
-                       label="&openFeedWebPageInMP.label;"
-                       oncommand="FeedMessageHandler.onOpenPref = 2"/>
-      </vbox>
-    </panelview>
-
-    <!-- Message / Tag -->
-    <panelview id="appMenu-messageTagView"
-               title="&tagMenu.label;"
-               class="PanelUI-subView">
-      <vbox class="panel-subview-body">
-        <toolbarbutton id="appmenu_addNewTag"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&addNewTag.label;"
-                       command="cmd_addTag"/>
-        <toolbarbutton id="appmenu_manageTags"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&manageTags.label;"
-                       command="cmd_manageTags"/>
-        <toolbarseparator id="appmenu_tagMenu-sep-afterTagAddNew"/>
-        <!-- Label for remove all tags is dynamically set. -->
-        <toolbarbutton id="appmenu_tagMenu-tagRemoveAll"
-                       class="subviewbutton subviewbutton-iconic"
-                       command="cmd_removeTags"/>
-        <toolbarseparator id="appmenu_tagMenuAfterRemoveSeparator"/>
-        <!-- Tag items are dynamically added here. -->
-      </vbox>
-    </panelview>
-
-    <!-- Message / Mark -->
-    <panelview id="appMenu-messageMarkView"
-               title="&markMenu.label;"
-               class="PanelUI-subView">
-      <vbox class="panel-subview-body">
-        <toolbarbutton id="appmenu_markReadMenuItem"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&markAsReadCmd.label;"
-                       key="key_toggleRead"
-                       command="cmd_markAsRead"/>
-        <toolbarbutton id="appmenu_markUnreadMenuItem"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&markAsUnreadCmd.label;"
-                       key="key_toggleRead"
-                       command="cmd_markAsUnread"/>
-        <toolbarbutton id="appmenu_markThreadAsRead"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&markThreadAsReadCmd.label;"
-                       key="key_markThreadAsRead"
-                       command="cmd_markThreadAsRead"/>
-        <toolbarbutton id="appmenu_markReadByDate"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&markReadByDateCmd.label;"
-                       key="key_markReadByDate"
-                       command="cmd_markReadByDate"/>
-        <toolbarbutton id="appmenu_markAllRead"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&markAllReadCmd.label;"
-                       key="key_markAllRead"
-                       command="cmd_markAllRead"/>
-        <toolbarseparator id="markMenuAfterAllReadSeparator"/>
-        <toolbarbutton id="appmenu_markFlaggedMenuItem"
-                       class="subviewbutton subviewbutton-iconic"
-                       type="checkbox"
-                       label="&markStarredCmd.label;"
-                       key="key_toggleFlagged"
-                       command="cmd_markAsFlagged"/>
-        <toolbarseparator id="markMenuAfterFlaggedSeparator"/>
-        <toolbarbutton id="appmenu_markAsJunk"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&markAsJunkCmd.label;"
-                       key="key_markJunk"
-                       command="cmd_markAsJunk"/>
-        <toolbarbutton id="appmenu_markAsNotJunk"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&markAsNotJunkCmd.label;"
-                       key="key_markNotJunk"
-                       command="cmd_markAsNotJunk"/>
-        <toolbarbutton id="appmenu_recalculateJunkScore"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&recalculateJunkScoreCmd.label;"
-                       command="cmd_recalculateJunkScore"/>
-      </vbox>
-    </panelview>
-
-    <!-- Message / Move To -->
-    <!-- toolbarbuttons are dynamically added by folder-panelview custom element. -->
-    <panelview is="folder-panelview" id="appMenu-messageMoveToView"
-               title="&moveMsgToMenu.label;"
-               class="PanelUI-subView"
-               oncommand="MsgMoveMessage(event.target._folder)"
-               mode="filing"
-               showFileHereLabel="true"
-               showRecent="true"
-               recentLabel="&moveCopyMsgRecentMenu.label;"
-               showFavorites="true"
-               favoritesLabel="&contextMoveCopyMsgFavoritesMenu.label;"
-               favoritesAccessKey="&contextMoveCopyMsgFavoritesMenu.accesskey;"/>
-
-    <!-- Message / Copy To -->
-    <!-- toolbarbuttons are dynamically added by folder-panelview custom element. -->
-    <panelview is="folder-panelview" id="appMenu-messageCopyToView"
-               title="&copyMsgToMenu.label;"
-               class="PanelUI-subView"
-               oncommand="MsgCopyMessage(event.target._folder)"
-               mode="filing"
-               showFileHereLabel="true"
-               showRecent="true"
-               recentLabel="&moveCopyMsgRecentMenu.label;"
-               showFavorites="true"
-               favoritesLabel="&contextMoveCopyMsgFavoritesMenu.label;"
-               favoritesAccessKey="&contextMoveCopyMsgFavoritesMenu.accesskey;"/>
-
     <!-- Tools -->
     <panelview id="appMenu-toolsView"
                data-l10n-id="appmenu-tools-panel-title"
diff --git a/mail/components/customizableui/content/panelUI.js b/mail/components/customizableui/content/panelUI.js
index 5b8730d7dd..1e4130a42c 100644
--- a/mail/components/customizableui/content/panelUI.js
+++ b/mail/components/customizableui/content/panelUI.js
@@ -5,7 +5,7 @@
 /* globals CanDetachAttachments
   currentAttachments FullScreen
   getIconForAttachment goUpdateAttachmentCommands initAddonPrefsMenu
-  initAppMenuPopup InitAppmenuViewBodyMenu InitAppMessageMenu
+  initAppMenuPopup InitAppmenuViewBodyMenu
   InitAppmenuViewMessagesMenu InitAppFolderViewsMenu InitAppViewSortByMenu
   InitMessageTags InitRecentlyClosedTabsPopup InitViewFolderViewsMenu
   InitViewHeadersMenu InitViewLayoutStyleMenu initSearchMessagesMenu
@@ -424,13 +424,6 @@ const PanelUI = {
       case "appMenu-goRecentlyClosedTabsView":
         PanelUI._refreshDynamicView(event, InitRecentlyClosedTabsPopup);
         break;
-      // Message
-      case "appMenu-messageView":
-        InitAppMessageMenu();
-        break;
-      case "appMenu-messageTagView":
-        PanelUI._refreshDynamicView(event, InitMessageTags);
-        break;
     }
   },
 
diff --git a/mail/locales/en-US/messenger/messenger.ftl b/mail/locales/en-US/messenger/messenger.ftl
index 6840e47a8d..b40973d26e 100644
--- a/mail/locales/en-US/messenger/messenger.ftl
+++ b/mail/locales/en-US/messenger/messenger.ftl
@@ -108,9 +108,6 @@ appmenu-settings =
 appmenu-addons-and-themes =
     .label = Add-ons and Themes
 
-appmenu-redirect-msg =
-    .label = Redirect
-
 ## Context menu
 
 context-menu-redirect-msg =