Allow newline in Extra Network activation text (#16428)

AUTOMATIC1111 · Oct 29, 2024 · 820fe8d · 820fe8d
1 parent deb3803
commit 820fe8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
@@ -201,7 +201,7 @@ function setupExtraNetworks() {
     setupExtraNetworksForTab('img2img');
 }
 
-var re_extranet = /<([^:^>]+:[^:]+):[\d.]+>(.*)/;
+var re_extranet = /<([^:^>]+:[^:]+):[\d.]+>(.*)/s;
 var re_extranet_g = /<([^:^>]+:[^:]+):[\d.]+>/g;
 
 var re_extranet_neg = /\(([^:^>]+:[\d.]+)\)/;

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
@@ -177,10 +177,8 @@ def add_pages_to_demo(app):
     app.add_api_route("/sd_extra_networks/get-single-card", get_single_card, methods=["GET"])
 
 
-def quote_js(s):
-    s = s.replace('\\', '\\\\')
-    s = s.replace('"', '\\"')
-    return f'"{s}"'
+def quote_js(s: str):
+    return json.dumps(s, ensure_ascii=False)
 
 
 class ExtraNetworksPage: