colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'thomasjsn-master'

This commit is contained in:
Dan Brown 2018-11-10 15:35:35 +00:00
parent 178b5af83a d0c166c207
commit ebd4c3327d
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/assets/js/components/markdown-editor.js
View File

@ -272,14 +272,15 @@ class MarkdownEditor {
let placeHolderText = `![${selectedText}](${placeholderImage})`; let placeHolderText = `![${selectedText}](${placeholderImage})`;
let cursor = cm.getCursor(); let 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 remoteFilename = "image-" + Date.now() + "." + ext;
let formData = new FormData(); let formData = new FormData();
formData.append('file', file, remoteFilename); formData.append('file', file, remoteFilename);
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 => { }).catch(err => {
window.$events.emit('error', trans('errors.image_upload_error')); window.$events.emit('error', trans('errors.image_upload_error'));
replaceContent(placeHolderText, selectedText); replaceContent(placeHolderText, selectedText);
@ -304,7 +305,7 @@ class MarkdownEditor {
let cursorPos = this.cm.getCursor('from'); let cursorPos = this.cm.getCursor('from');
window.ImageManager.show(image => { window.ImageManager.show(image => {
let selectedText = this.cm.getSelection(); 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.focus();
this.cm.replaceSelection(newText); this.cm.replaceSelection(newText);
this.cm.setCursor(cursorPos.line, cursorPos.ch + newText.length); this.cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);
@ -427,4 +428,4 @@ class MarkdownEditor {
} }
export default MarkdownEditor ; export default MarkdownEditor ;