X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ad48cd3e48ab5b16932d8c38032b80af619f525f..refs/pull/2416/head:/resources/js/components/wysiwyg-editor.js diff --git a/resources/js/components/wysiwyg-editor.js b/resources/js/components/wysiwyg-editor.js index 05897c250..bae70ad14 100644 --- a/resources/js/components/wysiwyg-editor.js +++ b/resources/js/components/wysiwyg-editor.js @@ -38,7 +38,7 @@ function editorPaste(event, editor, wysiwygComponent) { editor.dom.replace(newEl, id); }).catch(err => { editor.dom.remove(id); - window.$events.emit('error', trans('errors.image_upload_error')); + window.$events.emit('error', wysiwygComponent.imageUploadErrorText); console.log(err); }); }, 10); @@ -236,7 +236,7 @@ function codePlugin() { }); } -function drawIoPlugin(drawioUrl, isDarkMode, pageId) { +function drawIoPlugin(drawioUrl, isDarkMode, pageId, wysiwygComponent) { let pageEditor = null; let currentNode = null; @@ -280,7 +280,7 @@ function drawIoPlugin(drawioUrl, isDarkMode, pageId) { pageEditor.dom.setAttrib(imgElem, 'src', img.url); pageEditor.dom.setAttrib(currentNode, 'drawio-diagram', img.id); } catch (err) { - window.$events.emit('error', trans('errors.image_upload_error')); + window.$events.emit('error', wysiwygComponent.imageUploadErrorText); console.log(err); } return; @@ -295,7 +295,7 @@ function drawIoPlugin(drawioUrl, isDarkMode, pageId) { pageEditor.dom.get(id).parentNode.setAttribute('drawio-diagram', img.id); } catch (err) { pageEditor.dom.remove(id); - window.$events.emit('error', trans('errors.image_upload_error')); + window.$events.emit('error', wysiwygComponent.imageUploadErrorText); console.log(err); } }, 5); @@ -401,6 +401,11 @@ function listenForBookStackEditorEvents(editor) { editor.setContent(content); }); + // Insert editor content at the current location + window.$events.listen('editor::insert', ({html}) => { + editor.insertContent(html); + }); + // Focus on the editor window.$events.listen('editor::focus', () => { editor.focus(); @@ -409,12 +414,12 @@ function listenForBookStackEditorEvents(editor) { class WysiwygEditor { - setup() { this.elem = this.$el; this.pageId = this.$opts.pageId; this.textDirection = this.$opts.textDirection; + this.imageUploadErrorText = this.$opts.imageUploadErrorText; this.isDarkMode = document.documentElement.classList.contains('dark-mode'); this.plugins = "image table textcolor paste link autolink fullscreen code customhr autosave lists codeeditor media"; @@ -432,7 +437,7 @@ class WysiwygEditor { const drawioUrlElem = document.querySelector('[drawio-url]'); if (drawioUrlElem) { const url = drawioUrlElem.getAttribute('drawio-url'); - drawIoPlugin(url, this.isDarkMode, this.pageId); + drawIoPlugin(url, this.isDarkMode, this.pageId, this); this.plugins += ' drawio'; }