Merge branch 'master' into test_resolve_conflicts (1997ccff) · 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

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)

javascript/localization.js

0 → 100644

+146 −0

Original line number	Diff line number	Diff line

		// localization = {} -- the dict with translations is created by the backend

		ignore_ids_for_localization={
		setting_sd_hypernetwork: 'OPTION',
		setting_sd_model_checkpoint: 'OPTION',
		setting_realesrgan_enabled_models: 'OPTION',
		modelmerger_primary_model_name: 'OPTION',
		modelmerger_secondary_model_name: 'OPTION',
		modelmerger_tertiary_model_name: 'OPTION',
		train_embedding: 'OPTION',
		train_hypernetwork: 'OPTION',
		txt2img_style_index: 'OPTION',
		txt2img_style2_index: 'OPTION',
		img2img_style_index: 'OPTION',
		img2img_style2_index: 'OPTION',
		setting_random_artist_categories: 'SPAN',
		setting_face_restoration_model: 'SPAN',
		setting_realesrgan_enabled_models: 'SPAN',
		extras_upscaler_1: 'SPAN',
		extras_upscaler_2: 'SPAN',
		}

		re_num = /^[\.\d]+$/
		re_emoji = /[\p{Extended_Pictographic}\u{1F3FB}-\u{1F3FF}\u{1F9B0}-\u{1F9B3}]/u

		original_lines = {}
		translated_lines = {}

		function textNodesUnder(el){
		var n, a=[], walk=document.createTreeWalker(el,NodeFilter.SHOW_TEXT,null,false);
		while(n=walk.nextNode()) a.push(n);
		return a;
		}

		function canBeTranslated(node, text){
		if(! text) return false;
		if(! node.parentElement) return false;

		parentType = node.parentElement.nodeName
		if(parentType=='SCRIPT' \|\| parentType=='STYLE' \|\| parentType=='TEXTAREA') return false;

		if (parentType=='OPTION' \|\| parentType=='SPAN'){
		pnode = node
		for(var level=0; level<4; level++){
		pnode = pnode.parentElement
		if(! pnode) break;

		if(ignore_ids_for_localization[pnode.id] == parentType) return false;
		}
		}

		if(re_num.test(text)) return false;
		if(re_emoji.test(text)) return false;
		return true
		}

		function getTranslation(text){
		if(! text) return undefined

		if(translated_lines[text] === undefined){
		original_lines[text] = 1
		}

		tl = localization[text]
		if(tl !== undefined){
		translated_lines[tl] = 1
		}

		return tl
		}

		function processTextNode(node){
		text = node.textContent.trim()

		if(! canBeTranslated(node, text)) return

		tl = getTranslation(text)
		if(tl !== undefined){
		node.textContent = tl
		}
		}

		function processNode(node){
		if(node.nodeType == 3){
		processTextNode(node)
		return
		}

		if(node.title){
		tl = getTranslation(node.title)
		if(tl !== undefined){
		node.title = tl
		}
		}

		if(node.placeholder){
		tl = getTranslation(node.placeholder)
		if(tl !== undefined){
		node.placeholder = tl
		}
		}

		textNodesUnder(node).forEach(function(node){
		processTextNode(node)
		})
		}

		function dumpTranslations(){
		dumped = {}

		Object.keys(original_lines).forEach(function(text){
		if(dumped[text] !== undefined) return

		dumped[text] = localization[text] \|\| text
		})

		return dumped
		}

		onUiUpdate(function(m){
		m.forEach(function(mutation){
		mutation.addedNodes.forEach(function(node){
		processNode(node)
		})
		});
		})


		document.addEventListener("DOMContentLoaded", function() {
		processNode(gradioApp())
		})

		function download_localization() {
		text = JSON.stringify(dumpTranslations(), null, 4)

		var element = document.createElement('a');
		element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
		element.setAttribute('download', "localization.json");
		element.style.display = 'none';
		document.body.appendChild(element);

		element.click();

		document.body.removeChild(element);
		}

javascript/progressbar.js

+9 −3

Original line number	Diff line number	Diff line
		@@ -73,10 +73,16 @@ function check_gallery(id_gallery){
		let galleryBtnSelected = gradioApp().querySelector('#'+id_gallery+' .gallery-item.\\!ring-2')
		if (prevSelectedIndex !== -1 && galleryButtons.length>prevSelectedIndex && !galleryBtnSelected) {
		// automatically re-open previously selected index (if exists)
		activeElement = document.activeElement;
		activeElement = gradioApp().activeElement;

		galleryButtons[prevSelectedIndex].click();
		showGalleryImage();
		if(activeElement) activeElement.focus()

		if(activeElement){
		// i fought this for about an hour; i don't know why the focus is lost or why this helps recover it
		// if somenoe has a better solution please by all means
		setTimeout(function() { activeElement.focus() }, 1);
		}
		}
		})
		galleryObservers[id_gallery].observe( gallery, { childList:true, subtree:false })

Admin message