From bc921c66e5ef2f2a14286702e564c1b22dbba5a7 Mon Sep 17 00:00:00 2001 From: LawnMauer Date: Wed, 11 Jun 2025 03:16:50 +0200 Subject: [PATCH] Load js and css sources in UTF-8 (#7059) --- modules/html_generator.py | 7 ++++--- modules/ui.py | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/html_generator.py b/modules/html_generator.py index eac7d91a..af64894e 100644 --- a/modules/html_generator.py +++ b/modules/html_generator.py @@ -39,15 +39,16 @@ def minify_css(css: str) -> str: return css -with open(Path(__file__).resolve().parent / '../css/html_readable_style.css', 'r') as f: +with open(Path(__file__).resolve().parent / '../css/html_readable_style.css', 'r', encoding='utf-8') as f: readable_css = f.read() -with open(Path(__file__).resolve().parent / '../css/html_instruct_style.css', 'r') as f: +with open(Path(__file__).resolve().parent / '../css/html_instruct_style.css', 'r', encoding='utf-8') as f: instruct_css = f.read() # Custom chat styles chat_styles = {} for k in get_available_chat_styles(): - chat_styles[k] = open(Path(f'css/chat_style-{k}.css'), 'r').read() + with open(Path(f'css/chat_style-{k}.css'), 'r', encoding='utf-8') as f: + chat_styles[k] = f.read() # Handle styles that derive from other styles for k in chat_styles: diff --git a/modules/ui.py b/modules/ui.py index ca1ff528..59da5118 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -19,27 +19,27 @@ _last_extensions = None _last_show_controls = None _last_theme_state = None -with open(Path(__file__).resolve().parent / '../css/NotoSans/stylesheet.css', 'r') as f: +with open(Path(__file__).resolve().parent / '../css/NotoSans/stylesheet.css', 'r', encoding='utf-8') as f: css = f.read() -with open(Path(__file__).resolve().parent / '../css/main.css', 'r') as f: +with open(Path(__file__).resolve().parent / '../css/main.css', 'r', encoding='utf-8') as f: css += f.read() -with open(Path(__file__).resolve().parent / '../css/katex/katex.min.css', 'r') as f: +with open(Path(__file__).resolve().parent / '../css/katex/katex.min.css', 'r', encoding='utf-8') as f: css += f.read() -with open(Path(__file__).resolve().parent / '../css/highlightjs/highlightjs-copy.min.css', 'r') as f: +with open(Path(__file__).resolve().parent / '../css/highlightjs/highlightjs-copy.min.css', 'r', encoding='utf-8') as f: css += f.read() -with open(Path(__file__).resolve().parent / '../js/main.js', 'r') as f: +with open(Path(__file__).resolve().parent / '../js/main.js', 'r', encoding='utf-8') as f: js = f.read() -with open(Path(__file__).resolve().parent / '../js/global_scope_js.js', 'r') as f: +with open(Path(__file__).resolve().parent / '../js/global_scope_js.js', 'r', encoding='utf-8') as f: global_scope_js = f.read() -with open(Path(__file__).resolve().parent / '../js/save_files.js', 'r') as f: +with open(Path(__file__).resolve().parent / '../js/save_files.js', 'r', encoding='utf-8') as f: save_files_js = f.read() -with open(Path(__file__).resolve().parent / '../js/switch_tabs.js', 'r') as f: +with open(Path(__file__).resolve().parent / '../js/switch_tabs.js', 'r', encoding='utf-8') as f: switch_tabs_js = f.read() -with open(Path(__file__).resolve().parent / '../js/show_controls.js', 'r') as f: +with open(Path(__file__).resolve().parent / '../js/show_controls.js', 'r', encoding='utf-8') as f: show_controls_js = f.read() -with open(Path(__file__).resolve().parent / '../js/update_big_picture.js', 'r') as f: +with open(Path(__file__).resolve().parent / '../js/update_big_picture.js', 'r', encoding='utf-8') as f: update_big_picture_js = f.read() -with open(Path(__file__).resolve().parent / '../js/dark_theme.js', 'r') as f: +with open(Path(__file__).resolve().parent / '../js/dark_theme.js', 'r', encoding='utf-8') as f: dark_theme_js = f.read() refresh_symbol = '🔄'