wip: safe attempt to fix issue

Author: martgil

extension/js/content_scripts/webmail/generic/webmail-element-replacer.ts

@@ -14,7 +14,6 @@ export abstract class WebmailElementReplacer {
   public abstract reinsertReplyBox: (replyMsgId: string) => void;
   public abstract scrollToReplyBox: (replyMsgId: string) => void;
   public abstract scrollToCursorInReplyBox: (replyMsgId: string, cursorOffsetTop: number) => void;
-  public abstract addSecureActionsToMessageMenu: () => void;
 
   public runIntervalFunctionsPeriodically = () => {
     const intervalFunctions = this.getIntervalFunctions();

extension/js/content_scripts/webmail/gmail/gmail-element-replacer.ts

@@ -147,17 +147,6 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     }
   };
 
-  public addSecureActionsToMessageMenu = () => {
-    $(document).on('click', 'div.aHU.hx', event => {
-      const $actionsBtn = $(event.currentTarget).find(this.sel.msgActionsBtn);
-      if ($actionsBtn.length && !$('.action_menu_message_button').length) {
-        this.addMenuButton('a_reply', '#r');
-        this.addMenuButton('a_reply_all', '#r2');
-        this.addMenuButton('a_forward', '#r3');
-      }
-    });
-  };
-
   private everything = () => {
     this.replaceArmoredBlocks().catch(Catch.reportErr);
     this.replaceAttachments().catch(Catch.reportErr);
@@ -166,6 +155,7 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     this.replaceStandardReplyBox().catch(Catch.reportErr);
     this.evaluateStandardComposeRecipients().catch(Catch.reportErr);
     this.addSettingsBtn();
+    this.addSecureActionsToMessageMenu();
     this.renderLocalDrafts().catch(Catch.reportErr);
   };
 
@@ -879,6 +869,18 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     }
   };
 
+  private addSecureActionsToMessageMenu = () => {
+    $(this.sel.msgActionsBtn)
+      .off('click')
+      .on('click', () => {
+        if (!$('.action_menu_message_button').length) {
+          this.addMenuButton('a_reply', '#r');
+          this.addMenuButton('a_reply_all', '#r2');
+          this.addMenuButton('a_forward', '#r3');
+        }
+      });
+  };
+
   private renderLocalDrafts = async () => {
     if (window.location.hash === '#drafts') {
       const storage = await GlobalStore.get(['local_drafts']);

extension/js/content_scripts/webmail/gmail/gmail-webmail-startup.ts

@@ -45,7 +45,6 @@ export class GmailWebmailStartup {
     const messageRenderer = await MessageRenderer.newInstance(acctEmail, new Gmail(acctEmail), relayManager, factory);
     this.replacer = new GmailElementReplacer(factory, clientConfiguration, acctEmail, messageRenderer, injector, notifications, relayManager);
     await notifications.showInitial(acctEmail);
-    this.replacer.addSecureActionsToMessageMenu();
     this.replacer.runIntervalFunctionsPeriodically();
   };