diff options
author | AUTOMATIC <16777216c@gmail.com> | 2023-05-14 13:35:07 +0300 |
---|---|---|
committer | AUTOMATIC <16777216c@gmail.com> | 2023-05-14 13:35:07 +0300 |
commit | 89f9faa63388756314e8a1d96cf86bf5e0663045 (patch) | |
tree | 86c94057a383c3665f994c0c9ce0c5205deec14f /modules/ui.py | |
parent | b08500cec8a791ef20082628b49b17df833f5dda (diff) | |
parent | dbd13dee3aa7c8e37aa43f30a8272b50ba61e7fe (diff) |
Merge branch 'release_candidate'
Diffstat (limited to 'modules/ui.py')
-rw-r--r-- | modules/ui.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/ui.py b/modules/ui.py index d02f6e82..f07bcc41 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -1863,12 +1863,11 @@ def webpath(fn): def javascript_html():
- script_js = os.path.join(script_path, "script.js")
- head = f'<script type="text/javascript" src="{webpath(script_js)}"></script>\n'
+ # Ensure localization is in `window` before scripts
+ head = f'<script type="text/javascript">{localization.localization_js(shared.opts.localization)}</script>\n'
- inline = f"{localization.localization_js(shared.opts.localization)};"
- if cmd_opts.theme is not None:
- inline += f"set_theme('{cmd_opts.theme}');"
+ script_js = os.path.join(script_path, "script.js")
+ head += f'<script type="text/javascript" src="{webpath(script_js)}"></script>\n'
for script in modules.scripts.list_scripts("javascript", ".js"):
head += f'<script type="text/javascript" src="{webpath(script.path)}"></script>\n'
@@ -1876,7 +1875,8 @@ def javascript_html(): for script in modules.scripts.list_scripts("javascript", ".mjs"):
head += f'<script type="module" src="{webpath(script.path)}"></script>\n'
- head += f'<script type="text/javascript">{inline}</script>\n'
+ if cmd_opts.theme:
+ head += f'<script type="text/javascript">set_theme(\"{cmd_opts.theme}\");</script>\n'
return head
|