Merge pull request #1410 from BookStackApp/image_management_rewrite

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

 
 

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

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

+
+        const pageEditor = document.getElementById('page-editor');
+        this.pageId = pageEditor.getAttribute('page-id');
+        this.textDirection = pageEditor.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});
 


@@ -59,13 +64,26 @@ 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) {
+            if (action === 'insertDrawing' && (event.ctrlKey || event.metaKey)) {

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

+        // Mobile section toggling
+        this.elem.addEventListener('click', event => {
+            const toolbarLabel = event.target.closest('.editor-toolbar-label');
+            if (!toolbarLabel) return;
+
+            const currentActiveSections = this.elem.querySelectorAll('.markdown-editor-wrap');
+            for (let activeElem of currentActiveSections) {
+                activeElem.classList.remove('active');
+            }
+
+            toolbarLabel.closest('.markdown-editor-wrap').classList.add('active');
+        });
+

         window.$events.listen('editor-markdown-update', value => {
             this.cm.setValue(value);
             this.updateAndRender();
         window.$events.listen('editor-markdown-update', value => {
             this.cm.setValue(value);
             this.updateAndRender();


@@ -97,7 +115,12 @@ class MarkdownEditor {
     }
 
     codeMirrorSetup() {
     }
 
     codeMirrorSetup() {

-        let cm = this.cm;
+        const cm = this.cm;
+        const context = this;
+
+        // 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 = {};


@@ -262,20 +285,22 @@ class MarkdownEditor {
             }
 
             // Insert image into markdown
             }
 
             // Insert image into markdown

-            let id = "image-" + Math.random().toString(16).slice(2);
-            let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
-            let selectedText = cm.getSelection();
-            let placeHolderText = `![${selectedText}](${placeholderImage})`;
-            let cursor = cm.getCursor();
+            const id = "image-" + Math.random().toString(16).slice(2);
+            const placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
+            const selectedText = cm.getSelection();
+            const placeHolderText = `![${selectedText}](${placeholderImage})`;
+            const cursor = cm.getCursor();

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

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

 
 

-            let remoteFilename = "image-" + Date.now() + "." + ext;
-            let formData = new FormData();
+            const remoteFilename = "image-" + Date.now() + "." + ext;
+            const formData = new FormData();

             formData.append('file', file, remoteFilename);
             formData.append('file', file, remoteFilename);

+            formData.append('uploaded_to', context.pageId);

 
             window.$http.post('/images/gallery/upload', formData).then(resp => {
 
             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 => {
                 window.$events.emit('error', trans('errors.image_upload_error'));
                 replaceContent(placeHolderText, selectedText);
             }).catch(err => {
                 window.$events.emit('error', trans('errors.image_upload_error'));
                 replaceContent(placeHolderText, selectedText);


@@ -297,10 +322,10 @@ class MarkdownEditor {
     }
 
     actionInsertImage() {
     }
 
     actionInsertImage() {

-        let cursorPos = this.cm.getCursor('from');
+        const cursorPos = this.cm.getCursor('from');

         window.ImageManager.show(image => {
             let selectedText = this.cm.getSelection();
         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);


@@ -308,7 +333,7 @@ class MarkdownEditor {
     }
 
     actionShowImageManager() {
     }
 
     actionShowImageManager() {

-        let cursorPos = this.cm.getCursor('from');
+        const cursorPos = this.cm.getCursor('from');

         window.ImageManager.show(image => {
             this.insertDrawing(image, cursorPos);
         }, 'drawio');
         window.ImageManager.show(image => {
             this.insertDrawing(image, cursorPos);
         }, 'drawio');


@@ -316,7 +341,7 @@ class MarkdownEditor {
 
     // Show the popup link selector and insert a link when finished
     actionShowLinkSelector() {
 
     // Show the popup link selector and insert a link when finished
     actionShowLinkSelector() {

-        let cursorPos = this.cm.getCursor('from');
+        const cursorPos = this.cm.getCursor('from');

         window.EntitySelectorPopup.show(entity => {
             let selectedText = this.cm.getSelection() || entity.name;
             let newText = `[${selectedText}](${entity.link})`;
         window.EntitySelectorPopup.show(entity => {
             let selectedText = this.cm.getSelection() || entity.name;
             let newText = `[${selectedText}](${entity.link})`;


@@ -352,7 +377,7 @@ class MarkdownEditor {
     }
 
     insertDrawing(image, originalCursor) {
     }
 
     insertDrawing(image, originalCursor) {

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


@@ -360,14 +385,16 @@ class MarkdownEditor {
 
     // Show draw.io if enabled and handle save.
     actionEditDrawing(imgContainer) {
 
     // Show draw.io if enabled and handle save.
     actionEditDrawing(imgContainer) {

-        if (document.querySelector('[drawio-enabled]').getAttribute('drawio-enabled') !== 'true') return;
-        let cursorPos = this.cm.getCursor('from');
-        let drawingId = imgContainer.getAttribute('drawio-diagram');
+        const drawingDisabled = document.querySelector('[drawio-enabled]').getAttribute('drawio-enabled') !== 'true';
+        if (drawingDisabled) {
+            return;
+        }
+
+        const cursorPos = this.cm.getCursor('from');
+        const drawingId = imgContainer.getAttribute('drawio-diagram');

 
         DrawIO.show(() => {
 
         DrawIO.show(() => {

-            return window.$http.get(window.baseUrl(`/images/base64/${drawingId}`)).then(resp => {
-                return `data:image/png;base64,${resp.data.content}`;
-            });
+            return DrawIO.load(drawingId);

         }, (pngData) => {
 
             let data = {
         }, (pngData) => {
 
             let data = {


@@ -423,4 +450,4 @@ class MarkdownEditor {
 
 }
 
 
 }
 

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