Merge branch 'drawing_updates'

[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..06426bf349a0bfba4d9cda94ec06c769aa99e4b6 100644 (file)
--- a/resources/assets/js/components/markdown-editor.js
+++ b/resources/assets/js/components/markdown-editor.js
@@ -1,8 +1,8 @@
 const MarkdownIt = require("markdown-it");
 const mdTasksLists = require('markdown-it-task-lists');
 const MarkdownIt = require("markdown-it");
 const mdTasksLists = require('markdown-it-task-lists');

-const code = require('../libs/code');
+const code = require('../services/code');

 
 

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

 
 class MarkdownEditor {
 
 
 class MarkdownEditor {
 


@@ -52,6 +52,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();
         });
 


@@ -255,7 +259,9 @@ 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 + 2});

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


@@ -264,7 +270,7 @@ class MarkdownEditor {
             window.$http.post('/images/gallery/upload', formData).then(resp => {
                 replaceContent(placeholderImage, resp.data.thumbs.display);
             }).catch(err => {
             window.$http.post('/images/gallery/upload', formData).then(resp => {
                 replaceContent(placeholderImage, resp.data.thumbs.display);
             }).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);
             });


@@ -291,7 +297,14 @@ class MarkdownEditor {
             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 +335,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 +344,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 +368,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;