webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Aligned some editor events, Changed wysiwyg custom styles loading

Browse Source 
- Removed old 'editor-*-update' commands to instead use the aligned
  'editor::replace' command that we already have.
- Changed the way custom styles are loaded for the WYSIWYG editor so we
  don't need an API call but instead scape content from the parent page
  header using comments as identifiers. Added tests to ensure comments
  exist and align.
This commit is contained in:
Dan Brown
2022-02-08 01:01:37 +00:00
parent 15647a0409
commit e0d9380055
7 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/js/components/markdown-editor.js
View File

@ -98,11 +98,6 @@ class MarkdownEditor {
toolbarLabel.closest('.markdown-editor-wrap').classList.add('active');
});
window.$events.listen('editor-markdown-update', value => {
this.cm.setValue(value);
this.updateAndRender();
});
this.codeMirrorSetup();
this.listenForBookStackEditorEvents();

6
resources/js/components/page-editor.js
View File

@ -158,8 +158,10 @@ class PageEditor {
this.draftDisplay.innerText = this.editingPageText;
this.toggleDiscardDraftVisibility(false);
window.$events.emit('editor-html-update', response.data.html || '');
window.$events.emit('editor-markdown-update', response.data.markdown || response.data.html);
window.$events.emit('editor::replace', {
html: response.data.html,
markdown: response.data.markdown,
});
this.titleElem.value = response.data.name;
window.setTimeout(() => {

31
resources/js/wysiwyg/config.js
View File

@ -138,16 +138,16 @@ function gatherPlugins(options) {
}
/**
* Load custom HTML head content from the settings into the editor.
* TODO: We should be able to get this from current parent page?
* @param {Editor} editor
* Fetch custom HTML head content from the parent page head into the editor.
*/
function loadCustomHeadContent(editor) {
window.$http.get(window.baseUrl('/custom-head-content')).then(resp => {
if (!resp.data) return;
let head = editor.getDoc().querySelector('head');
head.innerHTML += resp.data;
});
function fetchCustomHeadContent() {
const headContentLines = document.head.innerHTML.split("\n");
const startLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- Start: custom user content -->');
const endLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- End: custom user content -->');
if (startLineIndex === -1 || endLineIndex === -1) {
return ''
}
return headContentLines.slice(startLineIndex + 1, endLineIndex).join('\n');
}
/**
@ -176,15 +176,6 @@ function getSetupCallback(options) {
window.$events.emit('editor-html-change', content);
}
// TODO - Update to standardise across both editors
// Use events within listenForBookStackEditorEvents instead (Different event signature)
window.$events.listen('editor-html-update', html => {
editor.setContent(html);
editor.selection.select(editor.getBody(), true);
editor.selection.collapse(false);
editorChange(html);
});
// Custom handler hook
window.$events.emitPublic(options.containerElement, 'editor-tinymce::setup', {editor});
@ -253,7 +244,9 @@ export function build(options) {
}
},
init_instance_callback(editor) {
loadCustomHeadContent(editor);
let head = editor.getDoc().querySelector('head');
console.log(fetchCustomHeadContent());
head.innerHTML += fetchCustomHeadContent();
},
setup(editor) {
for (const [key, config] of Object.entries(toolBarGroupButtons)) {