Rolled tri-layout to page edit and book-create

[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 3393829cc5c3712a5431976b37ac600ab8a4fbe7..9228cfe2c49445caa7aebe79c0859e2748fdc8cf 100644 (file)
--- a/resources/assets/js/components/markdown-editor.js
+++ b/resources/assets/js/components/markdown-editor.js
@@ -1,13 +1,14 @@
-const MarkdownIt = require("markdown-it");
-const mdTasksLists = require('markdown-it-task-lists');
-const code = require('../libs/code');
+import MarkdownIt from "markdown-it";
+import mdTasksLists from 'markdown-it-task-lists';
+import code from '../services/code';

 
 

-const DrawIO = require('../libs/drawio');
+import DrawIO from "../services/drawio";

 
 class MarkdownEditor {
 
     constructor(elem) {
         this.elem = elem;
 
 class MarkdownEditor {
 
     constructor(elem) {
         this.elem = elem;

+        this.textDirection = document.getElementById('page-editor').getAttribute('text-direction');

         this.markdown = new MarkdownIt({html: true});
         this.markdown.use(mdTasksLists, {label: true});
 
         this.markdown = new MarkdownIt({html: true});
         this.markdown.use(mdTasksLists, {label: true});
 


@@ -18,6 +19,13 @@ class MarkdownEditor {
 
         this.onMarkdownScroll = this.onMarkdownScroll.bind(this);
         this.init();
 
         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);
+        }

     }
 
     init() {
     }
 
     init() {


@@ -52,6 +60,10 @@ class MarkdownEditor {
             let action = button.getAttribute('data-action');
             if (action === 'insertImage') this.actionInsertImage();
             if (action === 'insertLink') this.actionShowLinkSelector();
             let action = button.getAttribute('data-action');
             if (action === 'insertImage') this.actionInsertImage();
             if (action === 'insertLink') this.actionShowLinkSelector();

+            if (action === 'insertDrawing' && event.ctrlKey) {
+                this.actionShowImageManager();
+                return;
+            }

             if (action === 'insertDrawing') this.actionStartDrawing();
         });
 
             if (action === 'insertDrawing') this.actionStartDrawing();
         });
 


@@ -87,6 +99,9 @@ class MarkdownEditor {
 
     codeMirrorSetup() {
         let cm = this.cm;
 
     codeMirrorSetup() {
         let cm = this.cm;

+        // Text direction
+        // cm.setOption('direction', this.textDirection);
+        cm.setOption('direction', 'ltr'); // Will force to remain as ltr for now due to issues when HTML is in editor.

         // Custom key commands
         let metaKey = code.getMetaKey();
         const extraKeys = {};
         // Custom key commands
         let metaKey = code.getMetaKey();
         const extraKeys = {};


@@ -255,16 +270,19 @@ class MarkdownEditor {
             let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
             let selectedText = cm.getSelection();
             let placeHolderText = `![${selectedText}](${placeholderImage})`;
             let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
             let selectedText = cm.getSelection();
             let placeHolderText = `![${selectedText}](${placeholderImage})`;

+            let cursor = cm.getCursor();

             cm.replaceSelection(placeHolderText);
             cm.replaceSelection(placeHolderText);

+            cm.setCursor({line: cursor.line, ch: cursor.ch + selectedText.length + 3});

 
             let remoteFilename = "image-" + Date.now() + "." + ext;
             let formData = new FormData();
             formData.append('file', file, remoteFilename);
 
             window.$http.post('/images/gallery/upload', formData).then(resp => {
 
             let remoteFilename = "image-" + Date.now() + "." + ext;
             let formData = new FormData();
             formData.append('file', file, remoteFilename);
 
             window.$http.post('/images/gallery/upload', formData).then(resp => {

-                replaceContent(placeholderImage, resp.data.thumbs.display);
+                const newContent = `[![${selectedText}](${resp.data.thumbs.display})](${resp.data.url})`;
+                replaceContent(placeHolderText, newContent);

             }).catch(err => {
             }).catch(err => {

-                events.emit('error', trans('errors.image_upload_error'));
+                window.$events.emit('error', trans('errors.image_upload_error'));

                 replaceContent(placeHolderText, selectedText);
                 console.log(err);
             });
                 replaceContent(placeHolderText, selectedText);
                 console.log(err);
             });


@@ -287,11 +305,18 @@ class MarkdownEditor {
         let cursorPos = this.cm.getCursor('from');
         window.ImageManager.show(image => {
             let selectedText = this.cm.getSelection();
         let cursorPos = this.cm.getCursor('from');
         window.ImageManager.show(image => {
             let selectedText = this.cm.getSelection();

-            let newText = "![" + (selectedText || image.name) + "](" + image.thumbs.display + ")";
+            let newText = "[![" + (selectedText || image.name) + "](" + image.thumbs.display + ")](" + image.url + ")";

             this.cm.focus();
             this.cm.replaceSelection(newText);
             this.cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);
             this.cm.focus();
             this.cm.replaceSelection(newText);
             this.cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);

-        });
+        }, 'gallery');
+    }
+
+    actionShowImageManager() {
+        let cursorPos = this.cm.getCursor('from');
+        window.ImageManager.show(image => {
+            this.insertDrawing(image, cursorPos);
+        }, 'drawio');

     }
 
     // Show the popup link selector and insert a link when finished
     }
 
     // Show the popup link selector and insert a link when finished


@@ -322,10 +347,7 @@ class MarkdownEditor {
             };
 
             window.$http.post(window.baseUrl('/images/drawing/upload'), data).then(resp => {
             };
 
             window.$http.post(window.baseUrl('/images/drawing/upload'), data).then(resp => {

-                let newText = `<div drawio-diagram="${resp.data.id}"><img src="${resp.data.url}"></div>`;
-                this.cm.focus();
-                this.cm.replaceSelection(newText);
-                this.cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);
+                this.insertDrawing(resp.data, cursorPos);

                 DrawIO.close();
             }).catch(err => {
                 window.$events.emit('error', trans('errors.image_upload_error'));
                 DrawIO.close();
             }).catch(err => {
                 window.$events.emit('error', trans('errors.image_upload_error'));


@@ -334,6 +356,13 @@ class MarkdownEditor {
         });
     }
 
         });
     }
 

+    insertDrawing(image, originalCursor) {
+        let newText = `<div drawio-diagram="${image.id}"><img src="${image.url}"></div>`;
+        this.cm.focus();
+        this.cm.replaceSelection(newText);
+        this.cm.setCursor(originalCursor.line, originalCursor.ch + newText.length);
+    }
+

     // Show draw.io if enabled and handle save.
     actionEditDrawing(imgContainer) {
         if (document.querySelector('[drawio-enabled]').getAttribute('drawio-enabled') !== 'true') return;
     // Show draw.io if enabled and handle save.
     actionEditDrawing(imgContainer) {
         if (document.querySelector('[drawio-enabled]').getAttribute('drawio-enabled') !== 'true') return;


@@ -351,8 +380,8 @@ class MarkdownEditor {
                 uploaded_to: Number(document.getElementById('page-editor').getAttribute('page-id'))
             };
 
                 uploaded_to: Number(document.getElementById('page-editor').getAttribute('page-id'))
             };
 

-            window.$http.put(window.baseUrl(`/images/drawing/upload/${drawingId}`), data).then(resp => {
-                let newText = `<div drawio-diagram="${resp.data.id}"><img src="${resp.data.url + `?updated=${Date.now()}`}"></div>`;
+            window.$http.post(window.baseUrl(`/images/drawing/upload`), data).then(resp => {
+                let newText = `<div drawio-diagram="${resp.data.id}"><img src="${resp.data.url}"></div>`;

                 let newContent = this.cm.getValue().split('\n').map(line => {
                     if (line.indexOf(`drawio-diagram="${drawingId}"`) !== -1) {
                         return newText;
                 let newContent = this.cm.getValue().split('\n').map(line => {
                     if (line.indexOf(`drawio-diagram="${drawingId}"`) !== -1) {
                         return newText;


@@ -370,6 +399,33 @@ class MarkdownEditor {
         });
     }
 
         });
     }
 

+    // Scroll to a specified text
+    scrollToText(searchText) {
+        if (!searchText) {
+            return;
+        }
+
+        const content = this.cm.getValue();
+        const lines = content.split(/\r?\n/);
+        let lineNumber = lines.findIndex(line => {
+            return line && line.indexOf(searchText) !== -1;
+        });
+
+        if (lineNumber === -1) {
+            return;
+        }
+
+        this.cm.scrollIntoView({
+            line: lineNumber,
+        }, 200);
+        this.cm.focus();
+        // set the cursor location.
+        this.cm.setCursor({
+            line: lineNumber,
+            char: lines[lineNumber].length
+        })
+    }
+

 }
 
 }
 

-module.exports = MarkdownEditor ;
\ No newline at end of file
+export default MarkdownEditor ;