@bobfrankston/rmfmail 1.1.225 → 1.1.228

package/client/compose/compose.bundle.js

@@ -2084,17 +2084,17 @@ async function createTinyMceEditor(container2, opts = {}) {
         };
         const BORDER_STYLES = { "border": "1px solid #888", "border-radius": "4px", "padding": "10px" };
         const openCodeDialog = () => {
-          const cs = ed.plugins.codesample;
           const preEl = ed.dom.getParent(ed.selection.getNode(), "pre");
           let curLang = "text";
           let curBorder = false;
+          let curCode = "";
           if (preEl) {
             const m = (preEl.className || "").match(/language-([\w-]+)/);
             if (m)
               curLang = m[1];
             curBorder = !!(preEl.style && preEl.style.border && preEl.style.border !== "none");
+            curCode = preEl.textContent || "";
           }
-          const curCode = cs && cs.getCurrentCode ? cs.getCurrentCode(ed) || "" : "";
           ed.windowManager.open({
             title: "Insert code",
             size: "large",
@@ -2113,15 +2113,16 @@ async function createTinyMceEditor(container2, opts = {}) {
             ],
             onSubmit: (api) => {
               const data = api.getData();
-              if (cs && cs.insertCodeSample)
-                cs.insertCodeSample(data.language, data.code);
-              const pre = ed.dom.getParent(ed.selection.getNode(), "pre");
-              if (pre) {
-                if (data.border)
-                  ed.dom.setStyles(pre, BORDER_STYLES);
-                else
-                  ed.dom.setStyles(pre, { "border": "", "border-radius": "", "padding": "" });
+              const lang = data.language || "text";
+              const esc = (s) => String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+              const borderStyle = data.border ? ` style="${Object.entries(BORDER_STYLES).map(([k, v]) => `${k}:${v}`).join(";")}"` : "";
+              const html = `<pre class="language-${lang}"${borderStyle}><code>${esc(data.code || "")}</code></pre>`;
+              if (preEl && preEl.parentNode) {
+                ed.dom.setOuterHTML(preEl, html);
+              } else {
+                ed.insertContent(html);
               }
+              ed.undoManager.add();
               api.close();
             }
           });
@@ -2260,6 +2261,17 @@ async function createTinyMceEditor(container2, opts = {}) {
     getText() {
       return editor2.getContent({ format: "text" });
     },
+    /** Subscribe to content changes. compose.ts calls this to drive draft
+     *  auto-save; it was MISSING from the facade, so the call threw
+     *  "editor.onContentChange is not a function" during compose init —
+     *  aborting the rest of init and leaving change-tracking unwired, so
+     *  edits made via dialogs (Insert code, Source code) were never
+     *  captured into the draft and looked "ignored" (Bob 2026-06-06).
+     *  `SetContent`/`ExecCommand` are the load-bearing events here: they're
+     *  what the codesample + code (source) dialogs fire on apply. */
+    onContentChange(handler) {
+      editor2.on("input change undo redo keyup SetContent ExecCommand AddUndo", () => handler());
+    },
     focus() {
       editor2.focus();
     },