Merge pull request #73 from cmason3/dev

allow textareas to be used in jinjafx_input
cmason3 · Feb 21, 2025 · 5d540e8 · 5d540e8
2 parents 55ae6d0 + d00a05c
commit 5d540e8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## CHANGELOG
 
+### [25.5.3] - Feb 21, 2025
+- Fixed issue #72 - `textarea` Inputs Not Recognized in Custom JinjaFx Input Forms
+
 ### [25.5.2] - Feb 11, 2025
 - Fixed a regression where Pandoc conversion to DOCX hasn't been working since 25.3.0
 
@@ -413,6 +416,7 @@
 - Initial release
 
 
+[25.5.3]: https://github.com/cmason3/jinjafx_server/compare/25.5.2...25.5.3
 [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

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.2'
+__version__ = '25.5.3'
 
 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="/84403509/jinjafx_m.js"></script>
+    <script src="/f15b2e54/jinjafx_m.js"></script>
   </head>
   <body>
     <div id="overlay"></div>

diff --git a/www/jinjafx_m.js b/www/jinjafx_m.js
@@ -1443,15 +1443,15 @@ function getStatusText(code) {
       });
 
       document.getElementById('jinjafx_input').addEventListener('shown.bs.modal', function (e) {
-        var focusable = document.getElementById('jinjafx_input_form').querySelectorAll('input,select');
+        var focusable = document.getElementById('jinjafx_input_form').querySelectorAll('input,select,textarea');
         if (focusable.length) {
           focusable[0].focus();
         }
       });
 
       document.getElementById('ml-input-reset').onclick = function(e) {
         document.getElementById('jinjafx_input_form').innerHTML = r_input_form;
-        var focusable = document.getElementById('jinjafx_input_form').querySelectorAll('input,select');
+        var focusable = document.getElementById('jinjafx_input_form').querySelectorAll('input,select,textarea');
         if (focusable.length) {
           focusable[0].focus();
         }
@@ -1463,7 +1463,7 @@ function getStatusText(code) {
           jinput.hide();
 
           var vars = {};
-          document.getElementById('input_form').querySelectorAll('input,select').forEach(function(e, i) {
+          document.getElementById('input_form').querySelectorAll('input,select,textarea').forEach(function(e, i) {
             if (e.getAttribute('data-var') != null) {
               if (e.dataset.var.match(/\S/)) {
                 var v = e.value;