PostalPortal/odfjs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

passing test

Browse Source
This commit is contained in:
David Bruant 2025-05-08 13:34:36 +02:00
parent 162d7e7cbb
commit 2ce1eb44bd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/odf/fillOdtTemplate.js
View File

@ -299,7 +299,7 @@ const elseMarker = '{:else}'
const closingIfMarker = '{/if}' const closingIfMarker = '{/if}'
const eachStartMarkerRegex = /{#each\s+([^}]+?)\s+as\s+([^}]+?)\s*}/; const eachStartMarkerRegex = /{#each\s+([^}]+?)\s+as\s+([^}]+?)\s*}/;
const eachClosingBlockMarker = '{/each}' const eachClosingMarker = '{/each}'
@ -366,7 +366,7 @@ function fillTemplatedOdtElement(rootElement, compartment) {
/** /**
* Looking for {/each} * Looking for {/each}
*/ */
const isEachClosingBlock = text.includes(eachClosingBlockMarker) const isEachClosingBlock = text.includes(eachClosingMarker)
if(isEachClosingBlock) { if(isEachClosingBlock) {
@ -836,9 +836,11 @@ function fillTemplatedOdtDocument(document, compartment) {
...findAllMatches(fullText, elseMarker), ...findAllMatches(fullText, elseMarker),
...findAllMatches(fullText, closingIfMarker), ...findAllMatches(fullText, closingIfMarker),
...findAllMatches(fullText, eachStartMarkerRegex), ...findAllMatches(fullText, eachStartMarkerRegex),
...findAllMatches(fullText, eachClosingBlockMarker) ...findAllMatches(fullText, eachClosingMarker)
]; ];
console.log('positionedMarkers', positionedMarkers)
// If no markers found, skip this container // If no markers found, skip this container
if(positionedMarkers.length >= 1) { if(positionedMarkers.length >= 1) {
@ -995,7 +997,7 @@ function fillTemplatedOdtDocument(document, compartment) {
let matchIndex; let matchIndex;
// looking for a block marker // looking for a block marker
for(const marker of [ifStartMarkerRegex, elseMarker, closingIfMarker, eachStartMarkerRegex, eachClosingBlockMarker]) { for(const marker of [ifStartMarkerRegex, elseMarker, closingIfMarker, eachStartMarkerRegex, eachClosingMarker]) {
if(typeof marker === 'string') { if(typeof marker === 'string') {
const index = remainingText.indexOf(marker) const index = remainingText.indexOf(marker)

BIN
tests/fixtures/liste-nombres-avec-formattage.odt vendored
View File

Binary file not shown.