From: Dan Brown <redacted>
Date: Sat, 10 Nov 2018 15:23:29 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/thomasjsn/BookStack into thomasjsn-master
X-Git-Tag: v0.24.2~3^2^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/321b53c827dd652549d92e9431c455b61e7faace?hp=-c

Merge branch 'master' of git://github.com/thomasjsn/BookStack into thomasjsn-master
---

321b53c827dd652549d92e9431c455b61e7faace
diff --combined resources/assets/js/components/markdown-editor.js
index 6eba242d0,88b61f0be..dd58a0ece
--- a/resources/assets/js/components/markdown-editor.js
+++ b/resources/assets/js/components/markdown-editor.js
@@@ -1,8 -1,8 +1,8 @@@
 -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 {
  
@@@ -304,7 -304,7 +304,7 @@@
          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);
@@@ -427,4 -427,4 +427,4 @@@
  
  }
  
- export default MarkdownEditor ;
 -module.exports = MarkdownEditor ;
++export default MarkdownEditor ;