Run `eslint --fix` (and normalize tabs to spaces) (9c54b78d) · Commits · github_fork / Stable Diffusion Webui

extensions-builtin/prompt-bracket-checker/javascript/prompt-bracket-checker.js

+26 −26

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ function checkBrackets(textArea, counterElt) {

		function setupBracketChecking(id_prompt, id_counter) {
		var textarea = gradioApp().querySelector("#" + id_prompt + " > label > textarea");
		var counter = gradioApp().getElementById(id_counter)
		var counter = gradioApp().getElementById(id_counter);

		if (textarea && counter) {
		textarea.addEventListener("input", () => checkBrackets(textarea, counter));

javascript/aspectRatioOverlay.js

+113 −111

Original line number	Diff line number	Diff line
		@@ -6,10 +6,10 @@ let arFrameTimeout = setTimeout(function(){},0);
		function dimensionChange(e, is_width, is_height) {

		if (is_width) {
		currentWidth = e.target.value*1.0
		currentWidth = e.target.value * 1.0;
		}
		if (is_height) {
		currentHeight = e.target.value*1.0
		currentHeight = e.target.value * 1.0;
		}

		var inImg2img = gradioApp().querySelector("#tab_img2img").style.display == "block";
		@@ -20,7 +20,7 @@ function dimensionChange(e, is_width, is_height){

		var targetElement = null;

		var tabIndex = get_tab_index('mode_img2img')
		var tabIndex = get_tab_index('mode_img2img');
		if (tabIndex == 0) { // img2img
		targetElement = gradioApp().querySelector('#img2img_image div[data-testid=image] img');
		} else if (tabIndex == 1) { //Sketch
		@@ -36,33 +36,33 @@ function dimensionChange(e, is_width, is_height){

		var arPreviewRect = gradioApp().querySelector('#imageARPreview');
		if (!arPreviewRect) {
		arPreviewRect = document.createElement('div')
		arPreviewRect = document.createElement('div');
		arPreviewRect.id = "imageARPreview";
		gradioApp().appendChild(arPreviewRect)
		gradioApp().appendChild(arPreviewRect);
		}



		var viewportOffset = targetElement.getBoundingClientRect();

		var viewportscale = Math.min( targetElement.clientWidth/targetElement.naturalWidth, targetElement.clientHeight/targetElement.naturalHeight )
		var viewportscale = Math.min(targetElement.clientWidth / targetElement.naturalWidth, targetElement.clientHeight / targetElement.naturalHeight);

		var scaledx = targetElement.naturalWidth*viewportscale
		var scaledy = targetElement.naturalHeight*viewportscale
		var scaledx = targetElement.naturalWidth * viewportscale;
		var scaledy = targetElement.naturalHeight * viewportscale;

		var cleintRectTop = (viewportOffset.top+window.scrollY)
		var cleintRectLeft = (viewportOffset.left+window.scrollX)
		var cleintRectCentreY = cleintRectTop + (targetElement.clientHeight/2)
		var cleintRectCentreX = cleintRectLeft + (targetElement.clientWidth/2)
		var cleintRectTop = (viewportOffset.top + window.scrollY);
		var cleintRectLeft = (viewportOffset.left + window.scrollX);
		var cleintRectCentreY = cleintRectTop + (targetElement.clientHeight / 2);
		var cleintRectCentreX = cleintRectLeft + (targetElement.clientWidth / 2);

		var arscale = Math.min( scaledx/currentWidth, scaledy/currentHeight )
		var arscaledx = currentWidth*arscale
		var arscaledy = currentHeight*arscale
		var arscale = Math.min(scaledx / currentWidth, scaledy / currentHeight);
		var arscaledx = currentWidth * arscale;
		var arscaledy = currentHeight * arscale;

		var arRectTop = cleintRectCentreY-(arscaledy/2)
		var arRectLeft = cleintRectCentreX-(arscaledx/2)
		var arRectWidth = arscaledx
		var arRectHeight = arscaledy
		var arRectTop = cleintRectCentreY - (arscaledy / 2);
		var arRectLeft = cleintRectCentreX - (arscaledx / 2);
		var arRectWidth = arscaledx;
		var arRectHeight = arscaledy;

		arPreviewRect.style.top = arRectTop + 'px';
		arPreviewRect.style.left = arRectLeft + 'px';
		@@ -92,20 +92,22 @@ onUiUpdate(function(){
		if (inImg2img) {
		let inputs = gradioApp().querySelectorAll('input');
		inputs.forEach(function(e) {
		var is_width = e.parentElement.id == "img2img_width"
		var is_height = e.parentElement.id == "img2img_height"
		var is_width = e.parentElement.id == "img2img_width";
		var is_height = e.parentElement.id == "img2img_height";

		if ((is_width \|\| is_height) && !e.classList.contains('scrollwatch')) {
		e.addEventListener('input', function(e){dimensionChange(e, is_width, is_height)} )
		e.classList.add('scrollwatch')
		e.addEventListener('input', function(e) {
		dimensionChange(e, is_width, is_height);
		});
		e.classList.add('scrollwatch');
		}
		if (is_width) {
		currentWidth = e.value*1.0
		currentWidth = e.value * 1.0;
		}
		if (is_height) {
		currentHeight = e.value*1.0
		currentHeight = e.value * 1.0;
		}
		})
		});
		}
		}
		});

javascript/contextMenus.js

+172 −166

Original line number	Diff line number	Diff line
		@@ -5,44 +5,44 @@ contextMenuInit = function(){

		const uid = function() {
		return Date.now().toString(36) + Math.random().toString(36).substring(2);
		}
		};

		function showContextMenu(event, element, menuEntries) {
		let posx = event.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
		let posy = event.clientY + document.body.scrollTop + document.documentElement.scrollTop;

		let oldMenu = gradioApp().querySelector('#context-menu')
		let oldMenu = gradioApp().querySelector('#context-menu');
		if (oldMenu) {
		oldMenu.remove()
		oldMenu.remove();
		}

		let baseStyle = window.getComputedStyle(uiCurrentTab)
		let baseStyle = window.getComputedStyle(uiCurrentTab);

		const contextMenu = document.createElement('nav')
		contextMenu.id = "context-menu"
		contextMenu.style.background = baseStyle.background
		contextMenu.style.color = baseStyle.color
		contextMenu.style.fontFamily = baseStyle.fontFamily
		contextMenu.style.top = posy+'px'
		contextMenu.style.left = posx+'px'
		const contextMenu = document.createElement('nav');
		contextMenu.id = "context-menu";
		contextMenu.style.background = baseStyle.background;
		contextMenu.style.color = baseStyle.color;
		contextMenu.style.fontFamily = baseStyle.fontFamily;
		contextMenu.style.top = posy + 'px';
		contextMenu.style.left = posx + 'px';



		const contextMenuList = document.createElement('ul')
		const contextMenuList = document.createElement('ul');
		contextMenuList.className = 'context-menu-items';
		contextMenu.append(contextMenuList);

		menuEntries.forEach(function(entry) {
		let contextMenuEntry = document.createElement('a')
		contextMenuEntry.innerHTML = entry['name']
		let contextMenuEntry = document.createElement('a');
		contextMenuEntry.innerHTML = entry['name'];
		contextMenuEntry.addEventListener("click", function() {
		entry['func']();
		})
		});
		contextMenuList.append(contextMenuEntry);

		})
		});

		gradioApp().appendChild(contextMenu)
		gradioApp().appendChild(contextMenu);

		let menuWidth = contextMenu.offsetWidth + 4;
		let menuHeight = contextMenu.offsetHeight + 4;
		@@ -62,29 +62,35 @@ contextMenuInit = function(){

		function appendContextMenuOption(targetElementSelector, entryName, entryFunction) {

		var currentItems = menuSpecs.get(targetElementSelector)
		var currentItems = menuSpecs.get(targetElementSelector);

		if (!currentItems) {
		currentItems = []
		currentItems = [];
		menuSpecs.set(targetElementSelector, currentItems);
		}
		let newItem = {'id':targetElementSelector+'_'+uid(),
		'name':entryName,
		'func':entryFunction,
		'isNew':true}
		let newItem = {
		id: targetElementSelector + '_' + uid(),
		name: entryName,
		func: entryFunction,
		isNew: true
		};

		currentItems.push(newItem)
		return newItem['id']
		currentItems.push(newItem);
		return newItem['id'];
		}

		function removeContextMenuOption(uid) {
		menuSpecs.forEach(function(v) {
		let index = -1
		v.forEach(function(e,ei){if(e['id']==uid){index=ei}})
		let index = -1;
		v.forEach(function(e, ei) {
		if (e['id'] == uid) {
		index = ei;
		}
		});
		if (index >= 0) {
		v.splice(index, 1);
		}
		})
		});
		}

		function addContextMenuEventListener() {
		@@ -93,32 +99,32 @@ contextMenuInit = function(){
		}
		gradioApp().addEventListener("click", function(e) {
		if (!e.isTrusted) {
		return
		return;
		}

		let oldMenu = gradioApp().querySelector('#context-menu')
		let oldMenu = gradioApp().querySelector('#context-menu');
		if (oldMenu) {
		oldMenu.remove()
		oldMenu.remove();
		}
		});
		gradioApp().addEventListener("contextmenu", function(e) {
		let oldMenu = gradioApp().querySelector('#context-menu')
		let oldMenu = gradioApp().querySelector('#context-menu');
		if (oldMenu) {
		oldMenu.remove()
		oldMenu.remove();
		}
		menuSpecs.forEach(function(v, k) {
		if (e.composedPath()[0].matches(k)) {
		showContextMenu(e,e.composedPath()[0],v)
		e.preventDefault()
		showContextMenu(e, e.composedPath()[0], v);
		e.preventDefault();
		}
		})
		});
		eventListenerApplied=true
		});
		eventListenerApplied = true;

		}

		return [appendContextMenuOption, removeContextMenuOption, addContextMenuEventListener]
		}
		return [appendContextMenuOption, removeContextMenuOption, addContextMenuEventListener];
		};

		initResponse = contextMenuInit();
		appendContextMenuOption = initResponse[0];
		@@ -133,34 +139,34 @@ addContextMenuEventListener = initResponse[2];
		if (!interruptbutton.offsetParent) {
		genbutton.click();
		}
		clearInterval(window.generateOnRepeatInterval)
		clearInterval(window.generateOnRepeatInterval);
		window.generateOnRepeatInterval = setInterval(function() {
		if (!interruptbutton.offsetParent) {
		genbutton.click();
		}
		},
		500)
		}
		500);
		};

		appendContextMenuOption('#txt2img_generate', 'Generate forever', function() {
		generateOnRepeat('#txt2img_generate', '#txt2img_interrupt');
		})
		});
		appendContextMenuOption('#img2img_generate', 'Generate forever', function() {
		generateOnRepeat('#img2img_generate', '#img2img_interrupt');
		})
		});

		let cancelGenerateForever = function() {
		clearInterval(window.generateOnRepeatInterval)
		}
		clearInterval(window.generateOnRepeatInterval);
		};

		appendContextMenuOption('#txt2img_interrupt','Cancel generate forever',cancelGenerateForever)
		appendContextMenuOption('#txt2img_generate', 'Cancel generate forever',cancelGenerateForever)
		appendContextMenuOption('#img2img_interrupt','Cancel generate forever',cancelGenerateForever)
		appendContextMenuOption('#img2img_generate', 'Cancel generate forever',cancelGenerateForever)
		appendContextMenuOption('#txt2img_interrupt', 'Cancel generate forever', cancelGenerateForever);
		appendContextMenuOption('#txt2img_generate', 'Cancel generate forever', cancelGenerateForever);
		appendContextMenuOption('#img2img_interrupt', 'Cancel generate forever', cancelGenerateForever);
		appendContextMenuOption('#img2img_generate', 'Cancel generate forever', cancelGenerateForever);

		})();
		//End example Context Menu Items

		onUiUpdate(function() {
		addContextMenuEventListener()
		addContextMenuEventListener();
		});

javascript/dragdrop.js

+24 −23

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ function dropReplaceImage( imgWrap, files ) {
		status: response.status,
		statusText: response.statusText,
		headers: response.headers
		})
		});
		}
		return response;
		};
		@@ -93,5 +93,6 @@ window.addEventListener('paste', e => {
		firstFreeImageField ?
		firstFreeImageField :
		visibleImageFields[visibleImageFields.length - 1]
		, files );
		, files
		);
		});

javascript/edit-attention.js

+120 −120

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@ function keyupEditAttention(event){
		if (!target.matches("[id='_toprow'] [id='_prompt'] textarea")) return;
		if (!(event.metaKey \|\| event.ctrlKey)) return;

		let isPlus = event.key == "ArrowUp"
		let isMinus = event.key == "ArrowDown"
		let isPlus = event.key == "ArrowUp";
		let isMinus = event.key == "ArrowDown";
		if (!isPlus && !isMinus) return;

		let selectionStart = target.selectionStart;
		@@ -69,12 +69,12 @@ function keyupEditAttention(event){

		event.preventDefault();

		var closeCharacter = ')'
		var delta = opts.keyedit_precision_attention
		var closeCharacter = ')';
		var delta = opts.keyedit_precision_attention;

		if (selectionStart > 0 && text[selectionStart - 1] == '<') {
		closeCharacter = '>'
		delta = opts.keyedit_precision_extra
		closeCharacter = '>';
		delta = opts.keyedit_precision_extra;
		} else if (selectionStart == 0 \|\| text[selectionStart - 1] != "(") {

		// do not include spaces at the end
		@@ -82,7 +82,7 @@ function keyupEditAttention(event){
		selectionEnd -= 1;
		}
		if (selectionStart == selectionEnd) {
		return
		return;
		}

		text = text.slice(0, selectionStart) + "(" + text.slice(selectionStart, selectionEnd) + ":1.0)" + text.slice(selectionEnd);
		@@ -97,7 +97,7 @@ function keyupEditAttention(event){

		weight += isPlus ? delta : -delta;
		weight = parseFloat(weight.toPrecision(12));
		if(String(weight).length == 1) weight += ".0"
		if (String(weight).length == 1) weight += ".0";

		if (closeCharacter == ')' && weight == 1) {
		text = text.slice(0, selectionStart - 1) + text.slice(selectionStart, selectionEnd) + text.slice(selectionEnd + 5);
		@@ -112,7 +112,7 @@ function keyupEditAttention(event){
		target.selectionStart = selectionStart;
		target.selectionEnd = selectionEnd;

		updateInput(target)
		updateInput(target);
		}

		addEventListener('keydown', (event) => {

Admin message