Merge pull request #13444 from AUTOMATIC1111/edit-attn-delimiters (7026b964) · Commits · github_fork / Stable Diffusion Webui

javascript/edit-attention.js

+8 −14

Original line number	Original line	Diff line number	Diff line
	@@ -18,22 +18,11 @@ function keyupEditAttention(event) {
	const before = text.substring(0, selectionStart);		const before = text.substring(0, selectionStart);
	let beforeParen = before.lastIndexOf(OPEN);		let beforeParen = before.lastIndexOf(OPEN);
	if (beforeParen == -1) return false;		if (beforeParen == -1) return false;
	let beforeParenClose = before.lastIndexOf(CLOSE);
	while (beforeParenClose !== -1 && beforeParenClose > beforeParen) {
	beforeParen = before.lastIndexOf(OPEN, beforeParen - 1);
	beforeParenClose = before.lastIndexOf(CLOSE, beforeParenClose - 1);
	}

	// Find closing parenthesis around current cursor		// Find closing parenthesis around current cursor
	const after = text.substring(selectionStart);		const after = text.substring(selectionStart);
	let afterParen = after.indexOf(CLOSE);		let afterParen = after.indexOf(CLOSE);
	if (afterParen == -1) return false;		if (afterParen == -1) return false;
	let afterParenOpen = after.indexOf(OPEN);
	while (afterParenOpen !== -1 && afterParen > afterParenOpen) {
	afterParen = after.indexOf(CLOSE, afterParen + 1);
	afterParenOpen = after.indexOf(OPEN, afterParenOpen + 1);
	}
	if (beforeParen === -1 \|\| afterParen === -1) return false;

	// Set the selection to the text between the parenthesis		// Set the selection to the text between the parenthesis
	const parenContent = text.substring(beforeParen + 1, selectionStart + afterParen);		const parenContent = text.substring(beforeParen + 1, selectionStart + afterParen);
	@@ -46,9 +35,14 @@ function keyupEditAttention(event) {

	function selectCurrentWord() {		function selectCurrentWord() {
	if (selectionStart !== selectionEnd) return false;		if (selectionStart !== selectionEnd) return false;
	const delimiters = opts.keyedit_delimiters + " \r\n\t";		const whitespace_delimiters = {"Tab": "\t", "Carriage Return": "\r", "Line Feed": "\n"};
			let delimiters = opts.keyedit_delimiters;

			for (let i of opts.keyedit_delimiters_whitespace) {
			delimiters += whitespace_delimiters[i];
			}

	// seek backward until to find beggining		// seek backward to find beginning
	while (!delimiters.includes(text[selectionStart - 1]) && selectionStart > 0) {		while (!delimiters.includes(text[selectionStart - 1]) && selectionStart > 0) {
	selectionStart--;		selectionStart--;
	}		}
	@@ -92,7 +86,7 @@ function keyupEditAttention(event) {
	}		}

	var end = text.slice(selectionEnd + 1).indexOf(closeCharacter) + 1;		var end = text.slice(selectionEnd + 1).indexOf(closeCharacter) + 1;
	var weight = parseFloat(text.slice(selectionEnd + 1, selectionEnd + 1 + end));		var weight = parseFloat(text.slice(selectionEnd + 1, selectionEnd + end));
	if (isNaN(weight)) return;		if (isNaN(weight)) return;

	weight += isPlus ? delta : -delta;		weight += isPlus ? delta : -delta;

modules/shared_options.py

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -256,7 +256,8 @@ options_templates.update(options_section(('ui', "User interface"), {
	"dimensions_and_batch_together": OptionInfo(True, "Show Width/Height and Batch sliders in same row").needs_reload_ui(),		"dimensions_and_batch_together": OptionInfo(True, "Show Width/Height and Batch sliders in same row").needs_reload_ui(),
	"keyedit_precision_attention": OptionInfo(0.1, "Ctrl+up/down precision when editing (attention:1.1)", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),		"keyedit_precision_attention": OptionInfo(0.1, "Ctrl+up/down precision when editing (attention:1.1)", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),
	"keyedit_precision_extra": OptionInfo(0.05, "Ctrl+up/down precision when editing <extra networks:0.9>", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),		"keyedit_precision_extra": OptionInfo(0.05, "Ctrl+up/down precision when editing <extra networks:0.9>", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),
	"keyedit_delimiters": OptionInfo(".,\\/!?%^*;:{}=`~()", "Ctrl+up/down word delimiters"),		"keyedit_delimiters": OptionInfo(r".,\/!?%^*;:{}=`~() ", "Ctrl+up/down word delimiters"),
			"keyedit_delimiters_whitespace": OptionInfo(["Tab", "Carriage Return", "Line Feed"], "Ctrl+up/down whitespace delimiters", gr.CheckboxGroup, lambda: {"choices": ["Tab", "Carriage Return", "Line Feed"]}),
	"keyedit_move": OptionInfo(True, "Alt+left/right moves prompt elements"),		"keyedit_move": OptionInfo(True, "Alt+left/right moves prompt elements"),
	"quicksettings_list": OptionInfo(["sd_model_checkpoint"], "Quicksettings list", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that appear at the top of page rather than in settings tab").needs_reload_ui(),		"quicksettings_list": OptionInfo(["sd_model_checkpoint"], "Quicksettings list", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that appear at the top of page rather than in settings tab").needs_reload_ui(),
	"ui_tab_order": OptionInfo([], "UI tab order", ui_components.DropdownMulti, lambda: {"choices": list(shared.tab_names)}).needs_reload_ui(),		"ui_tab_order": OptionInfo([], "UI tab order", ui_components.DropdownMulti, lambda: {"choices": list(shared.tab_names)}).needs_reload_ui(),

Admin message