From 1d42b4d0eb7b22cc98a7e7072de593830a7d27b6 Mon Sep 17 00:00:00 2001 From: David Bruant Date: Wed, 21 May 2025 15:04:16 +0200 Subject: [PATCH] fix minor bug --- scripts/odf/templating/fillOdtElementTemplate.js | 3 ++- scripts/odf/templating/prepareTemplateDOMTree.js | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/odf/templating/fillOdtElementTemplate.js b/scripts/odf/templating/fillOdtElementTemplate.js index 31d418a..a23043c 100644 --- a/scripts/odf/templating/fillOdtElementTemplate.js +++ b/scripts/odf/templating/fillOdtElementTemplate.js @@ -385,7 +385,8 @@ const EACH = eachStartMarkerRegex.source * @returns {void} */ export default function fillOdtElementTemplate(rootElement, compartment) { - //console.log('fillTemplatedOdtElement', rootElement.nodeType, rootElement.nodeName) + //console.log('fillTemplatedOdtElement', rootElement.nodeType, rootElement.nodeName, rootElement.textContent) + //console.log('fillTemplatedOdtElement', rootElement.childNodes[0].childNodes.length) let currentlyOpenBlocks = [] diff --git a/scripts/odf/templating/prepareTemplateDOMTree.js b/scripts/odf/templating/prepareTemplateDOMTree.js index 97aca53..8c75d9e 100644 --- a/scripts/odf/templating/prepareTemplateDOMTree.js +++ b/scripts/odf/templating/prepareTemplateDOMTree.js @@ -166,9 +166,10 @@ function consolidateMarkers(document){ ...Array.from(document.getElementsByTagName('text:h')) ] - const consolidatedMarkers = [] - for(const potentialMarkersContainer of potentialMarkersContainers) { + /** @type {{marker: string, index: number}[]} */ + const consolidatedMarkers = [] + /** @type {Text[]} */ let containerTextNodesInTreeOrder = []; @@ -245,13 +246,16 @@ function consolidateMarkers(document){ // Check if marker spans multiple nodes if(startNode !== endNode) { + //console.log('startNode !== endNode', startNode.textContent, endNode.textContent) const commonAncestor = findCommonAncestor(startNode, endNode) + /** @type {Node} */ let commonAncestorStartChild = startNode while(commonAncestorStartChild.parentNode !== commonAncestor){ commonAncestorStartChild = commonAncestorStartChild.parentNode } + /** @type {Node} */ let commonAncestorEndChild = endNode while(commonAncestorEndChild.parentNode !== commonAncestor){ commonAncestorEndChild = commonAncestorEndChild.parentNode @@ -324,7 +328,6 @@ function consolidateMarkers(document){ } } - //console.log('consolidatedMarkers', consolidatedMarkers) } /**