diff --git a/CHANGELOG.md b/CHANGELOG.md index 790680a..4b3a76e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## CHANGELOG +### [24.12.0] - Dec 2, 2024 +- Updated `data.csv` pane so it handles escaped commas as per JinjaFx 1.22.1 +- Updated `github-markdown-css` to 5.8.1 +- Updated copyright notices in preparation for 2025 + ### [24.10.1] - Nov 4, 2024 - Don't call `socket.shutdown()` before `socket.close()` else it raises an error on MacOS - Updated `github-markdown-css` to 5.7.0 @@ -343,6 +348,7 @@ ### 21.11.0 - Nov 29, 2021 - Initial release +[24.12.0]: https://github.com/cmason3/jinjafx_server/compare/24.10.1...24.12.0 [24.10.1]: https://github.com/cmason3/jinjafx_server/compare/24.10.0...24.10.1 [24.10.0]: https://github.com/cmason3/jinjafx_server/compare/24.9.0...24.10.0 [24.9.0]: https://github.com/cmason3/jinjafx_server/compare/24.6.4...24.9.0 diff --git a/LICENSE b/LICENSE index fc4c2ee..54aa784 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2024 Chris Mason (chris@netnix.org) +Copyright (c) 2020-2025 Chris Mason (chris@netnix.org) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/contrib/update_cdnjs_links.py b/contrib/update_cdnjs_links.py index 6888c82..cd464f6 100755 --- a/contrib/update_cdnjs_links.py +++ b/contrib/update_cdnjs_links.py @@ -10,7 +10,7 @@ 'dayjs': '1.11.13', 'pako': '2.1.0', 'jszip': '3.10.1', - 'github-markdown-css': '5.7.0' + 'github-markdown-css': '5.8.1' } def update_file(cdnjs_url, sri, f): diff --git a/jinjafx_server.py b/jinjafx_server.py index 073c830..c60e410 100755 --- a/jinjafx_server.py +++ b/jinjafx_server.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # JinjaFx Server - Jinja2 Templating Tool -# Copyright (c) 2020-2024 Chris Mason +# Copyright (c) 2020-2025 Chris Mason # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -28,7 +28,7 @@ import re, argparse, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip, requests, ctypes, subprocess import cmarkgfm, emoji -__version__ = '24.10.1' +__version__ = '24.12.0' llock = threading.RLock() rlock = threading.RLock() @@ -553,7 +553,7 @@ def html_escape(text): options = (cmarkgfm.cmark.Options.CMARK_OPT_GITHUB_PRE_LANG | cmarkgfm.cmark.Options.CMARK_OPT_SMART | cmarkgfm.cmark.Options.CMARK_OPT_UNSAFE) output = cmarkgfm.github_flavored_markdown_to_html(html_escape(output), options).replace('&', '&').replace('&', '&') head = '\n\n\n' - head += '\n' + head += '\n' head += '\n\n' output = emoji.emojize(output, language='alias').encode('ascii', 'xmlcharrefreplace').decode('utf-8') output = head + '\n
\n' + output + '
\n\n\n' @@ -928,7 +928,7 @@ def main(rflag=[0]): try: print('JinjaFx Server v' + __version__ + ' - Jinja2 Templating Tool') - print('Copyright (c) 2020-2024 Chris Mason \n') + print('Copyright (c) 2020-2025 Chris Mason \n') update_versioned_links(base + '/www') diff --git a/jinjafx_server/__main__.py b/jinjafx_server/__main__.py index 0f4e23c..e2590dd 100644 --- a/jinjafx_server/__main__.py +++ b/jinjafx_server/__main__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # JinjaFx Server - Jinja2 Templating Tool -# Copyright (c) 2020-2024 Chris Mason +# Copyright (c) 2020-2025 Chris Mason # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/setup.py b/setup.py index 542154a..e1c1b10 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ packages=["jinjafx_server"], include_package_data=True, package_data={'': ['www/*', 'pandoc/reference.docx']}, - install_requires=["jinjafx>=1.13.0", "requests", "cmarkgfm>=0.5.0", "emoji"], + install_requires=["jinjafx>=1.22.1", "requests", "cmarkgfm>=0.5.0", "emoji"], entry_points={ "console_scripts": [ "jinjafx_server=jinjafx_server:main", diff --git a/www/index.html b/www/index.html index 1cbf1f8..328a43b 100644 --- a/www/index.html +++ b/www/index.html @@ -32,7 +32,7 @@ - +
diff --git a/www/jinjafx_m.js b/www/jinjafx_m.js index 2d8c537..12e5781 100644 --- a/www/jinjafx_m.js +++ b/www/jinjafx_m.js @@ -1645,7 +1645,7 @@ function getStatusText(code) { function get_csv_astable(datarows) { var tc = (datarows[0].match(/\t/g) || []).length; var cc = (datarows[0].match(/,/g) || []).length; - var delim = new RegExp(cc > tc ? '[ \\t]*,[ \\t]*' : ' *\\t *'); + var delim = new RegExp(cc > tc ? '[ \\t]*(?'; @@ -1666,7 +1666,7 @@ function getStatusText(code) { } for (var col = 0; col < hrow.length; col++) { - var value = ((col < rowdata.length) ? quote(rowdata[col]) : ''); + var value = ((col < rowdata.length) ? quote(rowdata[col]) : '').replace(/\\,/g, ','); table += '' + (!value.match(/\S/) ? ' ' : value) + ''; } table += '';