Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
41196ccb
Commit
41196ccb
authored
Aug 30, 2023
by
zixaphir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
account for customizable extra network separators in remove code
previous behavior only searched for leading spaces
parent
6adf2b71
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
javascript/extraNetworks.js
javascript/extraNetworks.js
+7
-2
No files found.
javascript/extraNetworks.js
View file @
41196ccb
...
@@ -141,9 +141,12 @@ function setupExtraNetworks() {
...
@@ -141,9 +141,12 @@ function setupExtraNetworks() {
onUiLoaded
(
setupExtraNetworks
);
onUiLoaded
(
setupExtraNetworks
);
var
re_extranet
=
/<
([^
:
]
+:
[^
:
]
+
)
:
[\d
.
]
+>
(
.*
)
/
;
var
re_extranet
=
/<
([^
:
]
+:
[^
:
]
+
)
:
[\d
.
]
+>
(
.*
)
/
;
var
re_extranet_
g
=
/
\s
+<
([^
:
]
+:
[^
:
]
+
)
:
[\d
.
]
+>/g
;
var
re_extranet_
str
=
'
<([^:]+:[^:]+):[
\\
d.]+>
'
;
function
tryToRemoveExtraNetworkFromPrompt
(
textarea
,
text
)
{
function
tryToRemoveExtraNetworkFromPrompt
(
textarea
,
text
)
{
function
reEscape
(
s
)
{
return
s
.
replace
(
/
[
.*+?^${}()|[
\]\\]
/g
,
"
\\
$&
"
);
}
var
m
=
text
.
match
(
re_extranet
);
var
m
=
text
.
match
(
re_extranet
);
var
replaced
=
false
;
var
replaced
=
false
;
var
newTextareaText
;
var
newTextareaText
;
...
@@ -151,7 +154,9 @@ function tryToRemoveExtraNetworkFromPrompt(textarea, text) {
...
@@ -151,7 +154,9 @@ function tryToRemoveExtraNetworkFromPrompt(textarea, text) {
var
extraTextAfterNet
=
m
[
2
];
var
extraTextAfterNet
=
m
[
2
];
var
partToSearch
=
m
[
1
];
var
partToSearch
=
m
[
1
];
var
foundAtPosition
=
-
1
;
var
foundAtPosition
=
-
1
;
newTextareaText
=
textarea
.
value
.
replaceAll
(
re_extranet_g
,
function
(
found
,
net
,
pos
)
{
var
escapedSeparator
=
reEscape
(
opts
.
extra_networks_add_text_separator
);
var
re
=
new
RegExp
(
escapedSeparator
+
re_extranet_str
,
'
g
'
);
newTextareaText
=
textarea
.
value
.
replaceAll
(
re
,
function
(
found
,
net
,
pos
)
{
m
=
found
.
match
(
re_extranet
);
m
=
found
.
match
(
re_extranet
);
if
(
m
[
1
]
==
partToSearch
)
{
if
(
m
[
1
]
==
partToSearch
)
{
replaced
=
true
;
replaced
=
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment