Fixed issue causing text overlap in sort select box

[bookstack] / resources / assets / js / components / markdown-editor.js

diff --git a/resources/assets/js/components/markdown-editor.js b/resources/assets/js/components/markdown-editor.js
index 7cb56eef831ee5fb75636a1f91345a505dd528a8..c89a7ad8be87c41673c5e998bdef200f8bbe8f19 100644 (file)
--- a/resources/assets/js/components/markdown-editor.js
+++ b/resources/assets/js/components/markdown-editor.js
@@ -18,19 +18,18 @@ class MarkdownEditor {
         this.markdown.use(mdTasksLists, {label: true});
 
         this.display = this.elem.querySelector('.markdown-display');
         this.markdown.use(mdTasksLists, {label: true});
 
         this.display = this.elem.querySelector('.markdown-display');

+
+        this.displayStylesLoaded = false;

         this.input = this.elem.querySelector('textarea');
         this.htmlInput = this.elem.querySelector('input[name=html]');
         this.cm = code.markdownEditor(this.input);
 
         this.onMarkdownScroll = this.onMarkdownScroll.bind(this);
         this.input = this.elem.querySelector('textarea');
         this.htmlInput = this.elem.querySelector('input[name=html]');
         this.cm = code.markdownEditor(this.input);
 
         this.onMarkdownScroll = this.onMarkdownScroll.bind(this);

-        this.init();

 
 

-        // Scroll to text if needed.
-        const queryParams = (new URL(window.location)).searchParams;
-        const scrollText = queryParams.get('content-text');
-        if (scrollText) {
-            this.scrollToText(scrollText);
-        }
+        this.display.addEventListener('load', () => {
+            this.displayDoc = this.display.contentDocument;
+            this.init();
+        });

     }
 
     init() {
     }
 
     init() {


@@ -38,7 +37,7 @@ class MarkdownEditor {
         let lastClick = 0;
 
         // Prevent markdown display link click redirect
         let lastClick = 0;
 
         // Prevent markdown display link click redirect

-        this.display.addEventListener('click', event => {
+        this.displayDoc.addEventListener('click', event => {

             let isDblClick = Date.now() - lastClick < 300;
 
             let link = event.target.closest('a');
             let isDblClick = Date.now() - lastClick < 300;
 
             let link = event.target.closest('a');


@@ -92,21 +91,48 @@ class MarkdownEditor {
 
         this.codeMirrorSetup();
         this.listenForBookStackEditorEvents();
 
         this.codeMirrorSetup();
         this.listenForBookStackEditorEvents();

+
+        // Scroll to text if needed.
+        const queryParams = (new URL(window.location)).searchParams;
+        const scrollText = queryParams.get('content-text');
+        if (scrollText) {
+            this.scrollToText(scrollText);
+        }

     }
 
     // Update the input content and render the display.
     updateAndRender() {
     }
 
     // Update the input content and render the display.
     updateAndRender() {

-        let content = this.cm.getValue();
+        const content = this.cm.getValue();

         this.input.value = content;
         this.input.value = content;

-        let html = this.markdown.render(content);
+        const html = this.markdown.render(content);

         window.$events.emit('editor-html-change', html);
         window.$events.emit('editor-markdown-change', content);
         window.$events.emit('editor-html-change', html);
         window.$events.emit('editor-markdown-change', content);

-        this.display.innerHTML = html;
+
+        // Set body content
+        this.displayDoc.body.className = 'page-content';
+        this.displayDoc.body.innerHTML = html;

         this.htmlInput.value = html;
         this.htmlInput.value = html;

+
+        // Copy styles from page head and set custom styles for editor
+        this.loadStylesIntoDisplay();
+    }
+
+    loadStylesIntoDisplay() {
+        if (this.displayStylesLoaded) return;
+        this.displayDoc.documentElement.className = 'markdown-editor-display';
+
+        this.displayDoc.head.innerHTML = '';
+        const styles = document.head.querySelectorAll('style,link[rel=stylesheet]');
+        for (let style of styles) {
+            const copy = style.cloneNode(true);
+            this.displayDoc.head.appendChild(copy);
+        }
+
+        this.displayStylesLoaded = true;

     }
 
     onMarkdownScroll(lineCount) {
     }
 
     onMarkdownScroll(lineCount) {

-        const elems = this.display.children;
+        const elems = this.displayDoc.body.children;

         if (elems.length <= lineCount) return;
 
         const topElem = (lineCount === -1) ? elems[elems.length-1] : elems[lineCount];
         if (elems.length <= lineCount) return;
 
         const topElem = (lineCount === -1) ? elems[elems.length-1] : elems[lineCount];


@@ -200,16 +226,30 @@ class MarkdownEditor {
             }
         });
 
             }
         });
 

-        // Handle images on drag-drop
+        // Handle image & content drag n drop

         cm.on('drop', (cm, event) => {
         cm.on('drop', (cm, event) => {

-            event.stopPropagation();
-            event.preventDefault();
-            let cursorPos = cm.coordsChar({left: event.pageX, top: event.pageY});
-            cm.setCursor(cursorPos);
-            if (!event.dataTransfer || !event.dataTransfer.files) return;
-            for (let i = 0; i < event.dataTransfer.files.length; i++) {
-                uploadImage(event.dataTransfer.files[i]);
+
+            const templateId = event.dataTransfer.getData('bookstack/template');
+            if (templateId) {
+                const cursorPos = cm.coordsChar({left: event.pageX, top: event.pageY});
+                cm.setCursor(cursorPos);
+                event.preventDefault();
+                window.$http.get(`/templates/${templateId}`).then(resp => {
+                    const content = resp.data.markdown || resp.data.html;
+                    cm.replaceSelection(content);
+                });

             }
             }

+
+            if (event.dataTransfer && event.dataTransfer.files && event.dataTransfer.files.length > 0) {
+                const cursorPos = cm.coordsChar({left: event.pageX, top: event.pageY});
+                cm.setCursor(cursorPos);
+                event.stopPropagation();
+                event.preventDefault();
+                for (let i = 0; i < event.dataTransfer.files.length; i++) {
+                    uploadImage(event.dataTransfer.files[i]);
+                }
+            }
+

         });
 
         // Helper to replace editor content
         });
 
         // Helper to replace editor content