make sure init script is appended after the notes

see #1057
gildas-lormeau · Nov 22, 2022 · 912ce41 · 912ce41
1 parent b684511
commit 912ce41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/lib/single-file-extension-editor.js b/lib/single-file-extension-editor.js
@@ -1893,17 +1893,13 @@ pre code {
 				element.style.removeProperty("-sf-" + pointerEvents);
 			});
 			doc.body.removeAttribute("contentEditable");
-			const scriptElement = doc.createElement("script");
-			scriptElement.setAttribute(SCRIPT_TEMPLATE_SHADOW_ROOT, "");
-			scriptElement.textContent = getEmbedScript();
-			doc.body.appendChild(scriptElement);
 			const newResources = Object.keys(updatedResources).filter(url => updatedResources[url].type == "stylesheet").map(url => updatedResources[url]);
 			newResources.forEach(resource => {
 				const element = doc.createElement("style");
 				doc.body.appendChild(element);
 				element.textContent = resource.content;
 			});
-			return singlefile.helper.serialize(doc, compressHTML);
+			return singlefile.helper.serialize(doc, compressHTML) + "<script " + SCRIPT_TEMPLATE_SHADOW_ROOT + ">" + getEmbedScript() + "</script>";
 		}
 
 		function onUpdate(saved) {
@@ -2060,11 +2056,9 @@ pre code {
 			window.onresize = reflowNotes;
 			window.onUpdate = () => {};
 			document.documentElement.onmouseup = document.documentElement.ontouchend = onMouseUp;
-			window.addEventListener("DOMContentLoaded", () => {
-				processNode(document);
-				reflowNotes();
-				document.querySelectorAll(${JSON.stringify(NOTE_TAGNAME)}).forEach(noteElement => attachNoteListeners(noteElement));
-			});
+			processNode(document);
+			reflowNotes();
+			document.querySelectorAll(${JSON.stringify(NOTE_TAGNAME)}).forEach(noteElement => attachNoteListeners(noteElement));
 		})()`);
 		}
 

diff --git a/src/ui/content/content-ui-editor-web.js b/src/ui/content/content-ui-editor-web.js
@@ -1890,17 +1890,13 @@ pre code {
 			element.style.removeProperty("-sf-" + pointerEvents);
 		});
 		doc.body.removeAttribute("contentEditable");
-		const scriptElement = doc.createElement("script");
-		scriptElement.setAttribute(SCRIPT_TEMPLATE_SHADOW_ROOT, "");
-		scriptElement.textContent = getEmbedScript();
-		doc.body.appendChild(scriptElement);
 		const newResources = Object.keys(updatedResources).filter(url => updatedResources[url].type == "stylesheet").map(url => updatedResources[url]);
 		newResources.forEach(resource => {
 			const element = doc.createElement("style");
 			doc.body.appendChild(element);
 			element.textContent = resource.content;
 		});
-		return singlefile.helper.serialize(doc, compressHTML);
+		return singlefile.helper.serialize(doc, compressHTML) + "<script " + SCRIPT_TEMPLATE_SHADOW_ROOT + ">" + getEmbedScript() + "</script>";
 	}
 
 	function onUpdate(saved) {
@@ -2057,11 +2053,9 @@ pre code {
 			window.onresize = reflowNotes;
 			window.onUpdate = () => {};
 			document.documentElement.onmouseup = document.documentElement.ontouchend = onMouseUp;
-			window.addEventListener("DOMContentLoaded", () => {
-				processNode(document);
-				reflowNotes();
-				document.querySelectorAll(${JSON.stringify(NOTE_TAGNAME)}).forEach(noteElement => attachNoteListeners(noteElement));
-			});
+			processNode(document);
+			reflowNotes();
+			document.querySelectorAll(${JSON.stringify(NOTE_TAGNAME)}).forEach(noteElement => attachNoteListeners(noteElement));
 		})()`);
 	}