Merge branch 'dev' into ui_mobile_optimizations (f9c14a8c) · Commits · github_fork / Stable Diffusion Webui

CHANGELOG.md

+5 −0

Original line number	Diff line number	Diff line
		## 1.6.1

		### Bug Fixes:
		* fix an error causing the webui to fail to start ([#13839](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/13839))

		## 1.6.0

		### Features:

README.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ A browser interface based on Gradio library for Stable Diffusion.
		- Eased resolution restriction: generated image's dimensions must be a multiple of 8 rather than 64
		- Now with a license!
		- Reorder elements in the UI from settings screen
		- [Segmind Stable Diffusion](https://huggingface.co/segmind/SSD-1B) support

		## Installation and Running
		Make sure the required [dependencies](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Dependencies) are met and follow the instructions available for:

extensions-builtin/mobile/javascript/mobile.js

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@ function isMobile() {
		}

		function reportWindowSize() {
		if (gradioApp().querySelector('.toprow-compact-tools')) return; // not applicable for compact prompt layout

		var currentlyMobile = isMobile();
		if (currentlyMobile == isSetupForMobile) return;
		isSetupForMobile = currentlyMobile;

javascript/edit-attention.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ function keyupEditAttention(event) {
		if (afterParen == -1) return false;

		let afterOpeningParen = after.indexOf(OPEN);
		if (afterOpeningParen != -1 && afterOpeningParen < beforeParen) return false;
		if (afterOpeningParen != -1 && afterOpeningParen < afterParen) return false;

		// Set the selection to the text between the parenthesis
		const parenContent = text.substring(beforeParen + 1, selectionStart + afterParen);

javascript/extraNetworks.js

+49 −11

Original line number	Diff line number	Diff line
		@@ -26,8 +26,9 @@ function setupExtraNetworksForTab(tabname) {
		var refresh = gradioApp().getElementById(tabname + '_extra_refresh');
		var showDirsDiv = gradioApp().getElementById(tabname + '_extra_show_dirs');
		var showDirs = gradioApp().querySelector('#' + tabname + '_extra_show_dirs input');
		var promptContainer = gradioApp().querySelector('.prompt-container-compact#' + tabname + '_prompt_container');
		var negativePrompt = gradioApp().querySelector('#' + tabname + '_neg_prompt');

		sort.dataset.sortkey = 'sortDefault';
		tabs.appendChild(searchDiv);
		tabs.appendChild(sort);
		tabs.appendChild(sortOrder);
		@@ -49,20 +50,23 @@ function setupExtraNetworksForTab(tabname) {

		elem.style.display = visible ? "" : "none";
		});

		applySort();
		};

		var applySort = function() {
		var cards = gradioApp().querySelectorAll('#' + tabname + '_extra_tabs div.card');

		var reverse = sortOrder.classList.contains("sortReverse");
		var sortKey = sort.querySelector("input").value.toLowerCase().replace("sort", "").replaceAll(" ", "_").replace(/_+$/, "").trim();
		sortKey = sortKey ? "sort" + sortKey.charAt(0).toUpperCase() + sortKey.slice(1) : "";
		var sortKeyStore = sortKey ? sortKey + (reverse ? "Reverse" : "") : "";
		if (!sortKey \|\| sortKeyStore == sort.dataset.sortkey) {
		var sortKey = sort.querySelector("input").value.toLowerCase().replace("sort", "").replaceAll(" ", "_").replace(/_+$/, "").trim() \|\| "name";
		sortKey = "sort" + sortKey.charAt(0).toUpperCase() + sortKey.slice(1);
		var sortKeyStore = sortKey + "-" + (reverse ? "Descending" : "Ascending") + "-" + cards.length;

		if (sortKeyStore == sort.dataset.sortkey) {
		return;
		}

		sort.dataset.sortkey = sortKeyStore;

		var cards = gradioApp().querySelectorAll('#' + tabname + '_extra_tabs div.card');
		cards.forEach(function(card) {
		card.originalParentElement = card.parentElement;
		});
		@@ -88,15 +92,13 @@ function setupExtraNetworksForTab(tabname) {
		};

		search.addEventListener("input", applyFilter);
		applyFilter();
		["change", "blur", "click"].forEach(function(evt) {
		sort.querySelector("input").addEventListener(evt, applySort);
		});
		sortOrder.addEventListener("click", function() {
		sortOrder.classList.toggle("sortReverse");
		applySort();
		});
		applyFilter();

		extraNetworksApplySort[tabname] = applySort;
		extraNetworksApplyFilter[tabname] = applyFilter;

		var showDirsUpdate = function() {
		@@ -109,11 +111,47 @@ function setupExtraNetworksForTab(tabname) {
		showDirsUpdate();
		}

		function extraNetworksMovePromptToTab(tabname, id, showPrompt, showNegativePrompt) {
		if (!gradioApp().querySelector('.toprow-compact-tools')) return; // only applicable for compact prompt layout

		var promptContainer = gradioApp().getElementById(tabname + '_prompt_container');
		var prompt = gradioApp().getElementById(tabname + '_prompt_row');
		var negPrompt = gradioApp().getElementById(tabname + '_neg_prompt_row');
		var elem = id ? gradioApp().getElementById(id) : null;

		if (showNegativePrompt && elem) {
		elem.insertBefore(negPrompt, elem.firstChild);
		} else {
		promptContainer.insertBefore(negPrompt, promptContainer.firstChild);
		}

		if (showPrompt && elem) {
		elem.insertBefore(prompt, elem.firstChild);
		} else {
		promptContainer.insertBefore(prompt, promptContainer.firstChild);
		}
		}


		function extraNetworksUrelatedTabSelected(tabname) { // called from python when user selects an unrelated tab (generate)
		extraNetworksMovePromptToTab(tabname, '', false, false);
		}

		function extraNetworksTabSelected(tabname, id, showPrompt, showNegativePrompt) { // called from python when user selects an extra networks tab
		extraNetworksMovePromptToTab(tabname, id, showPrompt, showNegativePrompt);

		}

		function applyExtraNetworkFilter(tabname) {
		setTimeout(extraNetworksApplyFilter[tabname], 1);
		}

		function applyExtraNetworkSort(tabname) {
		setTimeout(extraNetworksApplySort[tabname], 1);
		}

		var extraNetworksApplyFilter = {};
		var extraNetworksApplySort = {};
		var activePromptTextarea = {};

		function setupExtraNetworks() {

Admin message