@bobfrankston/rmfmail 1.1.97 → 1.1.98

package/.commitmsg

@@ -1,15 +1,7 @@
-Reply scrolls to top; Ctrl+A no longer hijacked in text fields
+Signature now applied to replies/forwards, not just new mail
 
-- Reply/forward: setCursor(0) now scrolls the editor viewport to the top
-  (editor.getWin().scrollTo(0,0)), so the caret above the quoted block is
-  the line you're looking at instead of being left scrolled down inside
-  the quote.
-
-- Ctrl+A: the message-list select-all guard used `.closest(".message-list,
-  .ml-body, body)` — `body` always matches, so Ctrl+A in the search box
-  (or any input) selected every message instead of the box's text. Now it
-  returns early when focus is in an INPUT/TEXTAREA/SELECT/contenteditable,
-  so Ctrl+A selects (and lets you clear) the search field normally.
-
-- docs/rmf-tiny.md: marked implemented; added a running "Known TinyMCE
-  quirks" log (caret/scroll, link-extend, spellcheck, <p>-to-<br>).
+The new-format signature (acct.sig.text) was gated on "new mail only",
+so anyone using it got no signature on a reply or forward — only the
+legacy acct.signature field covered replies. Both formats now apply to
+new + reply + forward alike: above the quoted block on a reply/forward,
+at the end on new mail. Drafts still skip it (already in the saved body).

package/client/compose/compose.bundle.js

@@ -4006,14 +4006,18 @@ function applyInit(init) {
     (_match, attrs, inner) => `<pre${attrs}>${inner.replace(/\r\n|\r|\n/g, "<br>")}</pre>`
   );
   const acct = init.accounts.find((a) => a.id === init.accountId);
-  const isNew = init.mode !== "reply" && init.mode !== "replyAll" && init.mode !== "forward" && init.mode !== "draft" && !init.draftUid;
   const isReplyForward = init.mode === "reply" || init.mode === "replyAll" || init.mode === "forward";
-  if (isNew && acct?.sig?.text) {
-    const sigText = acct.sig.html ? acct.sig.text : escapeHtml(acct.sig.text).replace(/\n/g, "<br>");
-    bodyToRender = `${bodyToRender}<br><br>-- <br>${sigText}`;
-  } else if (acct?.signature && init.mode !== "draft" && !init.draftUid) {
-    const sigBlock = `<br><br>--<br>${acct.signature}`;
-    bodyToRender = isReplyForward ? `<br>${sigBlock}<br>${bodyToRender}` : `${bodyToRender}${sigBlock}`;
+  if (init.mode !== "draft" && !init.draftUid) {
+    let sigHtml = "";
+    if (acct?.sig?.text) {
+      sigHtml = acct.sig.html ? acct.sig.text : escapeHtml(acct.sig.text).replace(/\n/g, "<br>");
+    } else if (acct?.signature) {
+      sigHtml = acct.signature;
+    }
+    if (sigHtml) {
+      const sigBlock = `<br><br>-- <br>${sigHtml}`;
+      bodyToRender = isReplyForward ? `<br>${sigBlock}<br>${bodyToRender}` : `${bodyToRender}${sigBlock}`;
+    }
   }
   if (bodyToRender) {
     editor.setHtml(bodyToRender);