rich editor

front/js/svelte/libs/CodemirrorMarkdown.svelte

@@ -8,19 +8,25 @@
     import { indentWithTab } from "@codemirror/commands";
     import { markdown } from "@codemirror/lang-markdown";
     import { lintKeymap } from "@codemirror/lint";
+    import { fileurl, presetUrl } from "../files/imageserver";
 
     let parentElement;
     let codeMirrorView;
     export let value;
     export let editable = true;
 
-    export function insertMedia(info) {
-        let insertText = "";
-        if (info.file.width > 0) {
-            insertText = `![${info.file.filename}](${info.url})`;
-        } else {
-            insertText = `[${info.file.filename}](${info.originalUrl})`;
-        }
+    export function insertMedia(channel, files, presetPath) {
+        const insertText = files.reduce((text, aFile) => {
+            const url =
+                aFile.width > 0
+                    ? presetUrl(channel, aFile, presetPath)
+                    : fileurl(channel, aFile);
+
+            let addTest = `![${aFile.filename}](${url})`;
+
+            return text + "\n" + addTest;
+        }, "");
+
         const cursor = codeMirrorView.state.selection.main.head;
         const transaction = codeMirrorView.state.update({
             changes: {

front/js/svelte/libs/Trix.svelte

@@ -11,15 +11,16 @@
         value = e.target.value;
     }
 
-    export function insertMedia(info) {
-        if (info.file.width > 0) {
-            var attachment = new Trix.Attachment({ content: info.html });
-            editor.editor.insertAttachment(attachment);
-        } else {
-            editor.editor.insertHTML(
-                `<a href="${info.originalUrl}">${info.file.filename}</a>`,
-            );
-        }
+    export function insertMedia(html) {
+        console.log({ html });
+        var attachment = new Trix.Attachment({ content: html });
+        editor.editor.insertAttachment(attachment);
+        // if (info.file.width > 0) {
+        //     var attachment = new Trix.Attachment({ content: html });
+        //     editor.editor.insertAttachment(attachment);
+        // } else {
+        //     editor.editor.insertHTML(html);
+        // }
     }
 
     onMount(() => {