Merge pull request #8940 from space-nuko/fix-send-to-img2img (a89af232) · Commits · github_fork / Stable Diffusion Webui

javascript/imageviewer.js

+3 −21

Original line number	Diff line number	Diff line
		@@ -32,13 +32,7 @@ function negmod(n, m) {
		function updateOnBackgroundChange() {
		const modalImage = gradioApp().getElementById("modalImage")
		if (modalImage && modalImage.offsetParent) {
		let allcurrentButtons = gradioApp().querySelectorAll(".gallery-item.transition-all.\\!ring-2")
		let currentButton = null
		allcurrentButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		currentButton = elem;
		}
		})
		let currentButton = selected_gallery_button();

		if (currentButton?.children?.length > 0 && modalImage.src != currentButton.children[0].src) {
		modalImage.src = currentButton.children[0].src;
		@@ -50,22 +44,10 @@ function updateOnBackgroundChange() {
		}

		function modalImageSwitch(offset) {
		var allgalleryButtons = gradioApp().querySelectorAll(".gradio-gallery .thumbnail-item")
		var galleryButtons = []
		allgalleryButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		galleryButtons.push(elem);
		}
		})
		var galleryButtons = all_gallery_buttons();

		if (galleryButtons.length > 1) {
		var allcurrentButtons = gradioApp().querySelectorAll(".gradio-gallery .thumbnail-item.selected")
		var currentButton = null
		allcurrentButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		currentButton = elem;
		}
		})
		var currentButton = selected_gallery_button();

		var result = -1
		galleryButtons.forEach(function(v, i) {

javascript/ui.js

+31 −5

Original line number	Diff line number	Diff line
		@@ -7,9 +7,31 @@ function set_theme(theme){
		}
		}

		function all_gallery_buttons() {
		var allGalleryButtons = gradioApp().querySelectorAll('[style="display: block;"].tabitem div[id$=_gallery].gradio-gallery .thumbnails > .thumbnail-item.thumbnail-small');
		var visibleGalleryButtons = [];
		allGalleryButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		visibleGalleryButtons.push(elem);
		}
		})
		return visibleGalleryButtons;
		}

		function selected_gallery_button() {
		var allCurrentButtons = gradioApp().querySelectorAll('[style="display: block;"].tabitem div[id$=_gallery].gradio-gallery .thumbnail-item.thumbnail-small.selected');
		var visibleCurrentButton = null;
		allCurrentButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		visibleCurrentButton = elem;
		}
		})
		return visibleCurrentButton;
		}

		function selected_gallery_index(){
		var buttons = gradioApp().querySelectorAll('[style="display: block;"].tabitem div[id$=_gallery] .gallery-item')
		var button = gradioApp().querySelector('[style="display: block;"].tabitem div[id$=_gallery] .gallery-item.\\!ring-2')
		var buttons = all_gallery_buttons();
		var button = selected_gallery_button();

		var result = -1
		buttons.forEach(function(v, i){ if(v==button) { result = i } })
		@@ -18,14 +40,18 @@ function selected_gallery_index(){
		}

		function extract_image_from_gallery(gallery){
		if (gallery.length == 0){
		return [null];
		}
		if (gallery.length == 1){
		return [gallery[0]]
		return [gallery[0]];
		}

		index = selected_gallery_index()

		if (index < 0 \|\| index >= gallery.length){
		return [null]
		// Use the first image in the gallery as the default
		index = 0;
		}

		return [gallery[index]];

Admin message