Merge branch 'master' into hot-reload-javascript (05315d8a) · Commits · github_fork / Stable Diffusion Webui

.github/workflows/on_pull_request.yaml

+6 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,12 @@ jobs:
		uses: actions/setup-python@v3
		with:
		python-version: 3.10.6
		- uses: actions/cache@v2
		with:
		path: ~/.cache/pip
		key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
		restore-keys: \|
		${{ runner.os }}-pip-
		- name: Install PyLint
		run: \|
		python -m pip install --upgrade pip

artists.csv

+0 −7

Original line number	Diff line number	Diff line
		@@ -523,7 +523,6 @@ Affandi,0.7170285,nudity
		Diane Arbus,0.655138,digipa-high-impact
		Joseph Ducreux,0.65247905,digipa-high-impact
		Berthe Morisot,0.7165984,fineart
		Hilma AF Klint,0.71643853,scribbles
		Hilma af Klint,0.71643853,scribbles
		Filippino Lippi,0.7163017,fineart
		Leonid Afremov,0.7163005,fineart
		@@ -738,14 +737,12 @@ Abraham Mignon,0.60605425,fineart
		Albert Bloch,0.69573116,nudity
		Charles Dana Gibson,0.67155975,fineart
		Alexandre-Évariste Fragonard,0.6507174,fineart
		Alexandre-Évariste Fragonard,0.6507174,fineart
		Ernst Fuchs,0.6953538,nudity
		Alfredo Jaar,0.6952965,digipa-high-impact
		Judy Chicago,0.6952246,weird
		Frans van Mieris the Younger,0.6951849,fineart
		Aertgen van Leyden,0.6951305,fineart
		Emily Carr,0.69512105,fineart
		Frances Macdonald,0.6950408,scribbles
		Frances MacDonald,0.6950408,scribbles
		Hannah Höch,0.69495845,scribbles
		Gillis Rombouts,0.58770025,fineart
		@@ -895,7 +892,6 @@ Richard McGuire,0.6820089,scribbles
		Anni Albers,0.65708244,digipa-high-impact
		Aleksey Savrasov,0.65207493,fineart
		Wayne Barlowe,0.6537874,fineart
		Giorgio De Chirico,0.6815907,fineart
		Giorgio de Chirico,0.6815907,fineart
		Ernest Procter,0.6815795,fineart
		Adriaen Brouwer,0.6815058,fineart
		@@ -1241,7 +1237,6 @@ Betty Churcher,0.65387225,fineart
		Claes Corneliszoon Moeyaert,0.65386075,fineart
		David Bomberg,0.6537477,fineart
		Abraham Bosschaert,0.6535562,fineart
		Giuseppe De Nittis,0.65354455,fineart
		Giuseppe de Nittis,0.65354455,fineart
		John La Farge,0.65342575,fineart
		Frits Thaulow,0.65341854,fineart
		@@ -1522,7 +1517,6 @@ Gertrude Harvey,0.5903887,fineart
		Grant Wood,0.6266253,fineart
		Fyodor Vasilyev,0.5234919,digipa-med-impact
		Cagnaccio di San Pietro,0.6261671,fineart
		Cagnaccio Di San Pietro,0.6261671,fineart
		Doris Boulton-Maude,0.62593174,fineart
		Adolf Hirémy-Hirschl,0.5946784,fineart
		Harold von Schmidt,0.6256755,fineart
		@@ -2411,7 +2405,6 @@ Hermann Feierabend,0.5346168,digipa-high-impact
		Antonio Donghi,0.4610982,digipa-low-impact
		Adonna Khare,0.4858036,digipa-med-impact
		James Stokoe,0.5015107,digipa-med-impact
		Art & Language,0.5341332,digipa-high-impact
		Agustín Fernández,0.53403986,fineart
		Germán Londoño,0.5338712,fineart
		Emmanuelle Moureaux,0.5335641,digipa-high-impact

javascript/edit-attention.js

+32 −3

Original line number	Diff line number	Diff line
		@@ -9,9 +9,38 @@ addEventListener('keydown', (event) => {
		let minus = "ArrowDown"
		if (event.key != plus && event.key != minus) return;

		selectionStart = target.selectionStart;
		selectionEnd = target.selectionEnd;
		if(selectionStart == selectionEnd) return;
		let selectionStart = target.selectionStart;
		let selectionEnd = target.selectionEnd;
		// If the user hasn't selected anything, let's select their current parenthesis block
		if (selectionStart === selectionEnd) {
		// Find opening parenthesis around current cursor
		const before = target.value.substring(0, selectionStart);
		let beforeParen = before.lastIndexOf("(");
		if (beforeParen == -1) return;
		let beforeParenClose = before.lastIndexOf(")");
		while (beforeParenClose !== -1 && beforeParenClose > beforeParen) {
		beforeParen = before.lastIndexOf("(", beforeParen - 1);
		beforeParenClose = before.lastIndexOf(")", beforeParenClose - 1);
		}

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

		// Set the selection to the text between the parenthesis
		const parenContent = target.value.substring(beforeParen + 1, selectionStart + afterParen);
		const lastColon = parenContent.lastIndexOf(":");
		selectionStart = beforeParen + 1;
		selectionEnd = selectionStart + lastColon;
		target.setSelectionRange(selectionStart, selectionEnd);
		}

		event.preventDefault();

javascript/imageMaskFix.js

+3 −3

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ function imageMaskResize() {

		wrapper.style.width = `${wW}px`;
		wrapper.style.height = `${wH}px`;
		wrapper.style.left = `${(w-wW)/2}px`;
		wrapper.style.top = `${(h-wH)/2}px`;
		wrapper.style.left = `0px`;
		wrapper.style.top = `0px`;

		canvases.forEach( c => {
		c.style.width = c.style.height = '';

javascript/imageviewer.js

+2 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ function updateOnBackgroundChange() {
		}
		})

		if (modalImage.src != currentButton.children[0].src) {
		if (currentButton?.children?.length > 0 && modalImage.src != currentButton.children[0].src) {
		modalImage.src = currentButton.children[0].src;
		if (modalImage.style.display === 'none') {
		modal.style.setProperty('background-image', `url(${modalImage.src})`)
		@@ -116,6 +116,7 @@ function showGalleryImage() {
		e.dataset.modded = true;
		if(e && e.parentElement.tagName == 'DIV'){
		e.style.cursor='pointer'
		e.style.userSelect='none'
		e.addEventListener('click', function (evt) {
		if(!opts.js_modal_lightbox) return;
		modalZoomSet(gradioApp().getElementById('modalImage'), opts.js_modal_lightbox_initially_zoomed)

Admin message