luisgulo/BookStack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

WYSIWYG: Altered how custom head added to editors

Browse source 
Updated to parse and add as DOM nodes instead of innerHTML to avoid
triggering an update of all head content, which would throw warnings in
chromium in regard to setting the base URI.

For #4814
This commit is contained in:
Dan Brown 2024-01-30 11:38:47 +00:00
parent 415663a9bc
commit 24e6dc4b37
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/js/wysiwyg/config.js
View file

@ -143,16 +143,23 @@ function gatherPlugins(options) {
} }
/** /**
* Fetch custom HTML head content from the parent page head into the editor. * Fetch custom HTML head content nodes from the outer page head
* and add them to the given editor document.
* @param {Document} editorDoc
*/ */
function fetchCustomHeadContent() { function addCustomHeadContent(editorDoc) {
const headContentLines = document.head.innerHTML.split('\n'); const headContentLines = document.head.innerHTML.split('\n');
const startLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- Start: custom user content -->'); const startLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- Start: custom user content -->');
const endLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- End: custom user content -->'); const endLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- End: custom user content -->');
if (startLineIndex === -1 || endLineIndex === -1) { if (startLineIndex === -1 || endLineIndex === -1) {
return ''; return;
} }
return headContentLines.slice(startLineIndex + 1, endLineIndex).join('\n');
const customHeadHtml = headContentLines.slice(startLineIndex + 1, endLineIndex).join('\n');
const el = editorDoc.createElement('div');
el.innerHTML = customHeadHtml;
editorDoc.head.append(...el.children);
} }
/** /**
@ -284,8 +291,7 @@ export function buildForEditor(options) {
} }
}, },
init_instance_callback(editor) { init_instance_callback(editor) {
const head = editor.getDoc().querySelector('head'); addCustomHeadContent(editor.getDoc());
head.innerHTML += fetchCustomHeadContent();
}, },
setup(editor) { setup(editor) {
registerCustomIcons(editor); registerCustomIcons(editor);
@ -335,8 +341,7 @@ export function buildForInput(options) {
file_picker_types: 'file', file_picker_types: 'file',
file_picker_callback: filePickerCallback, file_picker_callback: filePickerCallback,
init_instance_callback(editor) { init_instance_callback(editor) {
const head = editor.getDoc().querySelector('head'); addCustomHeadContent(editor.getDoc());
head.innerHTML += fetchCustomHeadContent();
editor.contentDocument.documentElement.classList.toggle('dark-mode', options.darkMode); editor.contentDocument.documentElement.classList.toggle('dark-mode', options.darkMode);
}, },