Merge pull request #63 from cmason3/dev

cmason3 · web-flow · commit 462db8ce78f3 · 2025-01-23T07:05:45.000Z
fix regression
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## CHANGELOG
 
+### [25.3.1] - Jan 23, 2025
+- Fixed a regression where `jinjafx_input` wasn't working due to Output name validation
+
 ### [25.3.0] - Jan 23, 2025
 - Add directory structure to outputs in output pane if the output name contains `/`
 - Add output name validation to sanitise output names if invalid values are provided
@@ -388,6 +391,7 @@
 - Initial release
 
 
+[25.3.1]: https://github.com/cmason3/jinjafx_server/compare/25.3.0...25.3.1
 [25.3.0]: https://github.com/cmason3/jinjafx_server/compare/25.2.2...25.3.0
 [25.2.2]: https://github.com/cmason3/jinjafx_server/compare/25.2.1...25.2.2
 [25.2.1]: https://github.com/cmason3/jinjafx_server/compare/25.2.0...25.2.1
diff --git a/jinjafx_server.py b/jinjafx_server.py
@@ -26,7 +26,7 @@
 import re, argparse, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip, requests, ctypes, subprocess
 import cmarkgfm, emoji
 
-__version__ = '25.3.0'
+__version__ = '25.3.1'
 
 llock = threading.RLock()
 rlock = threading.RLock()
diff --git a/www/index.html b/www/index.html
@@ -32,7 +32,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/4.1.0/js-yaml.min.js" integrity="sha512-CSBhVREyzHAjAFfBlIBakjoRUKp5h7VSweP0InR/pAJyptH7peuhCsqAI/snV+TwZmXZqoUklpXp6R6wMnYf5Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <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/relativeTime.min.js" integrity="sha512-MVzDPmm7QZ8PhEiqJXKz/zw2HJuv61waxb8XXuZMMs9b+an3LoqOqhOEt5Nq3LY1e4Ipbbd/e+AWgERdHlVgaA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="/3bcdde1f/jinjafx_m.js"></script>
+    <script src="/d7ec0c8e/jinjafx_m.js"></script>
   </head>
   <body>
     <div id="overlay"></div>
diff --git a/www/jinjafx_m.js b/www/jinjafx_m.js
@@ -537,7 +537,7 @@ function getStatusText(code) {
                         try {
                           obj = JSON.parse(xHR.responseText);
                           if (obj.status === "ok") {
-                            r_input_form = d(obj.outputs['Output']);
+                            r_input_form = d(obj.outputs['Output:text']);
                             document.getElementById('jinjafx_input_form').innerHTML = r_input_form;
                             input_form = vars['jinjafx_input']['body'];
                             jinput = new bootstrap.Modal(document.getElementById('jinjafx_input'), {
