@bobfrankston/rmfmail 1.2.234 → 1.2.236

package/client/compose/compose.bundle.js

@@ -6607,9 +6607,17 @@ var extEditHintClose = null;
     if (btn) btn.style.display = "none";
   }
 }
+var wordEditOpening = false;
 document.getElementById("btn-edit-in-word")?.addEventListener("click", async () => {
+  const btn = document.getElementById("btn-edit-in-word");
+  if (wordEditOpening) return;
+  wordEditOpening = true;
+  if (btn) {
+    btn.disabled = true;
+    btn.style.opacity = "0.6";
+  }
   if (!wordEditId) wordEditId = `compose-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-  showDraftStatus("Opening in Word\u2026", false);
+  showDraftStatus("Opening in Word\u2026 (this takes a few seconds)", false);
   try {
     const result = await openInWord(wordEditId, editor.getHtml(), !!popoutInitId);
     if (!result.ok || result.opener === "none") {
@@ -6618,10 +6626,22 @@ document.getElementById("btn-edit-in-word")?.addEventListener("click", async ()
     }
     const label = result.opener === "word" ? "Word" : result.opener === "libreoffice" ? "LibreOffice" : "your default editor";
     const isDocx = /\.docx$/i.test(result.path || "");
-    showDraftStatus(`Editing in ${label} \u2014 Ctrl+S there and the message updates here automatically.`, false);
-    if (!isDocx) showExternalEditHint(label);
+    if (result.reused) {
+      showDraftStatus(`Already open in ${label} \u2014 brought that window to the front.`, false);
+    } else if (result.superseded) {
+      showDraftStatus(`Opened an updated copy in ${label}. Close the earlier ${label} window \u2014 changes made there no longer come back.`, true);
+    } else {
+      showDraftStatus(`Editing in ${label} \u2014 Ctrl+S there and the message updates here automatically.`, false);
+      if (!isDocx) showExternalEditHint(label);
+    }
   } catch (e) {
     showDraftStatus(`Edit-in-Word failed: ${e?.message || e}`, true);
+  } finally {
+    wordEditOpening = false;
+    if (btn) {
+      btn.disabled = false;
+      btn.style.opacity = "";
+    }
   }
 });
 document.getElementById("btn-compose-help")?.addEventListener("click", async () => {
@@ -6753,9 +6773,13 @@ function showExternalEditHint(editorLabel) {
 }
 onEvent((ev) => {
   if (ev?.type !== "wordEditUpdated") return;
-  if (!wordEditId || ev.editId !== wordEditId) return;
+  if (!wordEditId || ev.editId !== wordEditId) {
+    console.log(`[word-edit] ignoring save for ${ev.editId} \u2014 this window is ${wordEditId || "(no session)"}`);
+    return;
+  }
   try {
     extEditHintClose?.();
+    console.log(`[word-edit] applying mirrored save: ${(ev.html || "").length} chars (editId ${ev.editId})`);
     editor.setHtml(ev.html || "");
     showDraftStatus("Reloaded edits from external editor.", false);
     scheduleDraftSave();