fix issue with pandoc

cmason3 · Feb 11, 2025 · 72b3be1 · 72b3be1
1 parent d5411a6
commit 72b3be1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## CHANGELOG
 
+### [25.5.2] - Feb 11, 2025
+- Fixed a regression where Pandoc conversion to DOCX hasn't been working since 25.3.0
+
 ### [25.5.1] - Feb 11, 2025
 - Changed behaviour of `jinjafx_vault_undefined`, so it only returns undefined if the password is missing
 - Added support for adding blank lines between output sections using `</output\n>` as closing tag
@@ -410,6 +413,7 @@
 - Initial release
 
 
+[25.5.2]: https://github.com/cmason3/jinjafx_server/compare/25.5.1...25.5.2
 [25.5.1]: https://github.com/cmason3/jinjafx_server/compare/25.5.0...25.5.1
 [25.5.0]: https://github.com/cmason3/jinjafx_server/compare/25.4.0...25.5.0
 [25.4.0]: https://github.com/cmason3/jinjafx_server/compare/25.3.2...25.4.0

diff --git a/jinjafx_server.py b/jinjafx_server.py
@@ -27,7 +27,7 @@
 import re, argparse, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip, requests, ctypes, subprocess
 import cmarkgfm, emoji
 
-__version__ = '25.5.1'
+__version__ = '25.5.2'
 
 llock = threading.RLock()
 rlock = threading.RLock()

diff --git a/www/jinjafx_o.js b/www/jinjafx_o.js
@@ -93,7 +93,7 @@
           xHR.responseType = "blob";
           xHR.setRequestHeader("Content-Type", "application/json");
 
-          var o = JSON.stringify(obj.outputs[active + ':html']);
+          var o = JSON.stringify(obj.outputs[active]);
           if (o.length > 1024) {
             xHR.setRequestHeader("Content-Encoding", "gzip");
             xHR.send(pako.gzip(o));
@@ -259,12 +259,12 @@
                       section = dir;
                     }
                     links += '<li class="nav-item">';
-                    links += '<a class="nav-link' + ((oid == 1) ? ' active"' : '"') + ' data-bs-toggle="tab" href="#o' + oid + '">' + e[e.length - 1] + '</a>';
+                    links += '<a class="nav-link' + ((oid == 1) ? ' active"' : '"') + ' data-id="' + output + '" data-format="' + oformat + '" data-bs-toggle="tab" href="#o' + oid + '">' + e[e.length - 1] + '</a>';
                     links += '</li>';
                   }
                   else {
                     links += '<li class="nav-item">';
-                    links += '<a class="nav-link' + ((oid == 1) ? ' active"' : '"') + ' data-bs-toggle="tab" href="#o' + oid + '">' + g + '</a>';
+                    links += '<a class="nav-link' + ((oid == 1) ? ' active"' : '"') + ' data-id="' + output + '" data-format="' + oformat + '" data-bs-toggle="tab" href="#o' + oid + '">' + g + '</a>';
                     links += '</li>';
                   }
                   oid += 1;
@@ -294,8 +294,8 @@
                 function toggle_docx() {
                   var e = document.getElementsByClassName('nav-link active');
                   for (var i = 0; i < e.length; i++) {
-                    active = e.item(i).text;
-                    if (active + ':html' in obj.outputs) {
+                    active = e.item(i).getAttribute('data-id');
+                    if (e.item(i).getAttribute('data-format') == "html") {
                       document.getElementById('docx').classList.remove('d-none');
                     }
                     else {

diff --git a/www/output.html b/www/output.html
@@ -13,7 +13,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.13/dayjs.min.js" integrity="sha512-FwNWaxyfy2XlEINoSnZh1JQ5TRRtGow0D6XcmAWmYCRgvqOUTnzCxPc9uF35u5ZEpirk1uhlPVA19tflhvnW1g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/dayjs/1.11.13/plugin/advancedFormat.min.js" integrity="sha512-oOF6H/+bcZjL9xEZ71lPxWSLn62axEgf6jDBuge0rTy7HjcMmWLQ7Y46WVC0m1hGibeYyTeHLi1ZUrZTvt2QxQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js" integrity="sha512-XMVd28F1oH/O71fzwBnV7HucLxVwtxf26XV8P4wPk26EDxuGZ91N8bsOttmnomcCD3CS5ZMRL50H0GgOHvegtg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="/f4ceb754/jinjafx_o.js"></script>
+    <script src="/435f9b52/jinjafx_o.js"></script>
   </head>
   <body>
     <div id="status" class="alert alert-primary wait fw-bold">Generating Output...</div>