Merge branch 'master' into dev/deepdanbooru

2 files changed, 56 insertions, 0 deletions

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
new file mode 100644
index 00000000..c67ed579
--- /dev/null
+++ b/javascript/edit-attention.js
@@ -0,0 +1,41 @@
+addEventListener('keydown', (event) => {

+	let target = event.originalTarget;

+	if (!target.hasAttribute("placeholder")) return;

+	if (!target.placeholder.toLowerCase().includes("prompt")) return;

+

+	let plus = "ArrowUp"

+	let minus = "ArrowDown"

+	if (event.key != plus && event.key != minus) return;

+

+	selectionStart = target.selectionStart;

+	selectionEnd = target.selectionEnd;

+	if(selectionStart == selectionEnd) return;

+

+	event.preventDefault();

+

+	if (selectionStart == 0 || target.value[selectionStart - 1] != "(") {

+		target.value = target.value.slice(0, selectionStart) +

+			"(" + target.value.slice(selectionStart, selectionEnd) + ":1.0)" +

+			target.value.slice(selectionEnd);

+

+		target.focus();

+		target.selectionStart = selectionStart + 1;

+		target.selectionEnd = selectionEnd + 1;

+

+	} else {

+		end = target.value.slice(selectionEnd + 1).indexOf(")") + 1;

+		weight = parseFloat(target.value.slice(selectionEnd + 1, selectionEnd + 1 + end));

+		if (event.key == minus) weight -= 0.1;

+		if (event.key == plus) weight += 0.1;

+

+		weight = parseFloat(weight.toPrecision(12));

+

+		target.value = target.value.slice(0, selectionEnd + 1) +

+			weight +

+			target.value.slice(selectionEnd + 1 + end - 1);

+

+		target.focus();

+		target.selectionStart = selectionStart;

+		target.selectionEnd = selectionEnd;

+	}

+});

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 1e297abb..f9e9290e 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -4,6 +4,21 @@ global_progressbars = {}
 function check_progressbar(id_part, id_progressbar, id_progressbar_span, id_interrupt, id_preview, id_gallery){
     var progressbar = gradioApp().getElementById(id_progressbar)
     var interrupt = gradioApp().getElementById(id_interrupt)
+    
+    if(opts.show_progress_in_title && progressbar && progressbar.offsetParent){
+        if(progressbar.innerText){
+            let newtitle = 'Stable Diffusion - ' + progressbar.innerText
+            if(document.title != newtitle){
+                document.title =  newtitle;          
+            }
+        }else{
+            let newtitle = 'Stable Diffusion'
+            if(document.title != newtitle){
+                document.title =  newtitle;          
+            }
+        }
+    }
+    
 	if(progressbar!= null && progressbar != global_progressbars[id_progressbar]){
 	    global_progressbars[id_progressbar] = progressbar