Merge pull request #12877 from zixaphir/removeExtraNetworksFromPrompt_fix (fcfe5c17) · Commits · github_fork / Stable Diffusion Webui

javascript/extraNetworks.js

+10 −4

Original line number	Diff line number	Diff line
		@@ -140,14 +140,15 @@ function setupExtraNetworks() {

		onUiLoaded(setupExtraNetworks);

		var re_extranet = /<([^:]+:[^:]+):[\d.]+>(.*)/;
		var re_extranet_g = /\s+<([^:]+:[^:]+):[\d.]+>/g;
		var re_extranet = /<([^:^>]+:[^:]+):[\d.]+>(.*)/;
		var re_extranet_g = /<([^:^>]+:[^:]+):[\d.]+>/g;

		function tryToRemoveExtraNetworkFromPrompt(textarea, text) {
		var m = text.match(re_extranet);
		var replaced = false;
		var newTextareaText;
		if (m) {
		var extraTextBeforeNet = opts.extra_networks_add_text_separator;
		var extraTextAfterNet = m[2];
		var partToSearch = m[1];
		var foundAtPosition = -1;
		@@ -161,9 +162,14 @@ function tryToRemoveExtraNetworkFromPrompt(textarea, text) {
		return found;
		});

		if (foundAtPosition >= 0 && newTextareaText.substr(foundAtPosition, extraTextAfterNet.length) == extraTextAfterNet) {
		if (foundAtPosition >= 0) {
		if (newTextareaText.substr(foundAtPosition, extraTextAfterNet.length) == extraTextAfterNet) {
		newTextareaText = newTextareaText.substr(0, foundAtPosition) + newTextareaText.substr(foundAtPosition + extraTextAfterNet.length);
		}
		if (newTextareaText.substr(foundAtPosition - extraTextBeforeNet.length, extraTextBeforeNet.length) == extraTextBeforeNet) {
		newTextareaText = newTextareaText.substr(0, foundAtPosition - extraTextBeforeNet.length) + newTextareaText.substr(foundAtPosition);
		}
		}
		} else {
		newTextareaText = textarea.value.replaceAll(new RegExp(text, "g"), function(found) {
		if (found == text) {