ifhub/inform7
1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-06-26 04:00:43 +03:00
Code Issues Projects Releases Wiki Activity

Escape backslashes in Javascript install() and uninstall() calls

Browse source
This commit is contained in:
David Kinder 2023-08-08 12:06:35 +01:00
parent 180b5af03b
commit f9c3961110
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
inbuild/supervisor-module/Chapter 7/The Installer.w
View file

@ -693,13 +693,10 @@ int ExtensionInstaller::seek_extension_in_graph(inbuild_copy *C, build_vertex *V
=
void ExtensionInstaller::install_button(OUTPUT_STREAM, inform_project *proj,
inbuild_copy *C) {
TEMPORARY_TEXT(URL)
if (C->location_if_file)
WRITE_TO(URL, "%f", C->location_if_file);
else
WRITE_TO(URL, "%p", C->location_if_path);
HTML_OPEN_WITH("a", "class=\"registrycontentslink\" href='javascript:project().install(\"%S\")'", URL);
DISCARD_TEXT(URL)
TEMPORARY_TEXT(js_path)
@<Get the extension path escaped for use in Javascript@>
HTML_OPEN_WITH("a", "class=\"registrycontentslink\" href='javascript:project().install(\"%S\")'", js_path);
DISCARD_TEXT(js_path)
ExtensionInstaller::install_icon(OUT);
HTML_CLOSE("a");
}
@ -710,13 +707,10 @@ void ExtensionInstaller::install_icon(OUTPUT_STREAM) {
void ExtensionInstaller::uninstall_button(OUTPUT_STREAM, inform_project *proj,
inbuild_copy *C) {
TEMPORARY_TEXT(URL)
if (C->location_if_file)
WRITE_TO(URL, "%f", C->location_if_file);
else
WRITE_TO(URL, "%p", C->location_if_path);
HTML_OPEN_WITH("a", "class=\"registrycontentslink\" href='javascript:project().uninstall(\"%S\")'", URL);
DISCARD_TEXT(URL)
TEMPORARY_TEXT(js_path)
@<Get the extension path escaped for use in Javascript@>
HTML_OPEN_WITH("a", "class=\"registrycontentslink\" href='javascript:project().uninstall(\"%S\")'", js_path);
DISCARD_TEXT(js_path)
ExtensionInstaller::uninstall_icon(OUT);
HTML_CLOSE("a");
}
@ -724,3 +718,18 @@ void ExtensionInstaller::uninstall_button(OUTPUT_STREAM, inform_project *proj,
void ExtensionInstaller::uninstall_icon(OUTPUT_STREAM) {
WRITE("<span class=\"paste\">%c%c</span>", 0x2198, 0xFE0F); /* Unicode "down right arrow" */
}
@<Get the extension path escaped for use in Javascript@> =
TEMPORARY_TEXT(path)
if (C->location_if_file)
WRITE_TO(path, "%f", C->location_if_file);
else
WRITE_TO(path, "%p", C->location_if_path);
LOOP_THROUGH_TEXT(pos, path) {
wchar_t c = Str::get(pos);
if (c == '\\')
WRITE_TO(js_path, "\\\\");
else
PUT_TO(js_path, c);
}
DISCARD_TEXT(path)