@bobfrankston/rmfmail 1.2.220 → 1.2.221

package/client/compose/compose.bundle.js

@@ -1611,8 +1611,8 @@ function readConfigHelp(name) {
 function unsubscribeOneClick(url) {
   return ipc().unsubscribeOneClick?.(url);
 }
-function openInWord(editId, html) {
-  return ipc().openInWord?.(editId, html) ?? Promise.resolve({ ok: false, path: "", opener: "none" });
+function openInWord(editId, html, fromPopout = false) {
+  return ipc().openInWord?.(editId, html, fromPopout) ?? Promise.resolve({ ok: false, path: "", opener: "none" });
 }
 function closeWordEdit(editId) {
   return ipc().closeWordEdit?.(editId) ?? Promise.resolve();
@@ -6229,7 +6229,7 @@ document.getElementById("btn-edit-in-word")?.addEventListener("click", async ()
   if (!wordEditId) wordEditId = `compose-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   showDraftStatus("Opening in Word\u2026", false);
   try {
-    const result = await openInWord(wordEditId, editor.getHtml());
+    const result = await openInWord(wordEditId, editor.getHtml(), !!popoutInitId);
     if (!result.ok || result.opener === "none") {
       showDraftStatus("Couldn't launch an editor. Install Word, LibreOffice, or set a default for .html.", true);
       return;
@@ -6381,6 +6381,12 @@ onEvent((ev) => {
     showDraftStatus(`Reload failed: ${e?.message || e}`, true);
   }
 });
+onEvent((ev) => {
+  if (ev?.type !== "wordEditClosed") return;
+  if (!wordEditId || ev.editId !== wordEditId) return;
+  extEditHintClose?.();
+  showDraftStatus("Word closed \u2014 edits are in the message.", false);
+});
 window.addEventListener("beforeunload", () => {
   if (wordEditId) closeWordEdit(wordEditId).catch(() => {
   });