Merge pull request #1 from BookStackApp/master

[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 96cc1e6d10d228a9e8047d53da4e8969abc07238..b099a7ca9dbb3a26a43790fb64ba7dbe89b41d07 100644 (file)
--- a/resources/assets/js/components/markdown-editor.js
+++ b/resources/assets/js/components/markdown-editor.js
@@ -64,7 +64,7 @@ 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;
             }
                 this.actionShowImageManager();
                 return;
             }


@@ -394,9 +394,7 @@ class MarkdownEditor {
         const drawingId = imgContainer.getAttribute('drawio-diagram');
 
         DrawIO.show(() => {
         const drawingId = imgContainer.getAttribute('drawio-diagram');
 
         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 = {