From 9ecf3471339d011983f2e3c878e920e49718ff90 Mon Sep 17 00:00:00 2001
From: AlUlkesh <99896447+AlUlkesh@users.noreply.github.com>
Date: Mon, 27 Mar 2023 20:01:19 +0200
Subject: fix: lightboxModal, selectedTab

---
 javascript/generationParams.js | 2 +-
 javascript/imageviewer.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'javascript')

diff --git a/javascript/generationParams.js b/javascript/generationParams.js
index 95f05093..06a771bc 100644
--- a/javascript/generationParams.js
+++ b/javascript/generationParams.js
@@ -16,7 +16,7 @@ onUiUpdate(function(){
 
 let modalObserver = new MutationObserver(function(mutations) {
 	mutations.forEach(function(mutationRecord) {
-		let selectedTab = gradioApp().querySelector('#tabs div button.bg-white')?.innerText
+		let selectedTab = gradioApp().querySelector('#tabs div button')?.innerText
 		if (mutationRecord.target.style.display === 'none' && selectedTab === 'txt2img' || selectedTab === 'img2img')
 			gradioApp().getElementById(selectedTab+"_generation_info_button").click()
 	});
diff --git a/javascript/imageviewer.js b/javascript/imageviewer.js
index d6483562..bb61ee24 100644
--- a/javascript/imageviewer.js
+++ b/javascript/imageviewer.js
@@ -251,7 +251,7 @@ document.addEventListener("DOMContentLoaded", function() {
 
     modal.appendChild(modalNext)
 
-    gradioApp().appendChild(modal)
+    gradioApp().body.appendChild(modal)
 
 
     document.body.appendChild(modal);
-- 
cgit v1.2.1


From 5a25826d841a13574ab6afbeb9c50c81a491fa21 Mon Sep 17 00:00:00 2001
From: AlUlkesh <99896447+AlUlkesh@users.noreply.github.com>
Date: Tue, 28 Mar 2023 23:28:46 +0200
Subject: try both versions of appendChild

---
 javascript/imageviewer.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'javascript')

diff --git a/javascript/imageviewer.js b/javascript/imageviewer.js
index bb61ee24..3deffa9b 100644
--- a/javascript/imageviewer.js
+++ b/javascript/imageviewer.js
@@ -251,8 +251,11 @@ document.addEventListener("DOMContentLoaded", function() {
 
     modal.appendChild(modalNext)
 
-    gradioApp().body.appendChild(modal)
-
+    try {
+		gradioApp().appendChild(modal);
+	} catch (e) {
+		gradioApp().body.appendChild(modal);
+	}
 
     document.body.appendChild(modal);
 
-- 
cgit v1.2.1


From c938b172a49433291e246b04f9835f3383bad0c8 Mon Sep 17 00:00:00 2001
From: bbonvi <6573230@gmail.com>
Date: Fri, 31 Mar 2023 19:29:34 +0600
Subject: fix missing live preview and progress during certain tasks

Sometimes tasks take longer than 5 seconds to start,
resulting in missing progress bar and livepreviews,
so we have to keep pulling for progress a bit longer (5s -> 20s).
---
 javascript/progressbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript')

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 4ac9b8db..eb44aab9 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -138,7 +138,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 return
             }
 
-            if(elapsedFromStart > 5 && !res.queued && !res.active){
+            if(elapsedFromStart > 20 && !res.queued && !res.active){
                 removeProgressBar()
                 return
             }
-- 
cgit v1.2.1


From 54fd00ff8f6fc1396ce0396772962b45609e7a9c Mon Sep 17 00:00:00 2001
From: Liam <liamtherkerr@gmail.com>
Date: Mon, 3 Apr 2023 13:28:20 -0400
Subject: fixed logic for updating the displayed generation params when the
 image modal is closed

---
 javascript/generationParams.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'javascript')

diff --git a/javascript/generationParams.js b/javascript/generationParams.js
index 95f05093..1266a266 100644
--- a/javascript/generationParams.js
+++ b/javascript/generationParams.js
@@ -16,9 +16,9 @@ onUiUpdate(function(){
 
 let modalObserver = new MutationObserver(function(mutations) {
 	mutations.forEach(function(mutationRecord) {
-		let selectedTab = gradioApp().querySelector('#tabs div button.bg-white')?.innerText
-		if (mutationRecord.target.style.display === 'none' && selectedTab === 'txt2img' || selectedTab === 'img2img')
-			gradioApp().getElementById(selectedTab+"_generation_info_button").click()
+		let selectedTab = gradioApp().querySelector('#tabs div button.selected')?.innerText
+		if (mutationRecord.target.style.display === 'none' && (selectedTab === 'txt2img' || selectedTab === 'img2img'))
+			gradioApp().getElementById(selectedTab+"_generation_info_button")?.click()
 	});
 });
 
-- 
cgit v1.2.1


From 02e351880796422eac3bbaf7aa86332b588651ce Mon Sep 17 00:00:00 2001
From: tqwuliao <king_ghost@yeah.net>
Date: Sat, 15 Apr 2023 23:20:08 +0800
Subject: Add new FilenameGenerator [hasprompt<prompt1|default><prompt2>..]

---
 javascript/hints.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'javascript')

diff --git a/javascript/hints.js b/javascript/hints.js
index 7f4101b2..730ce7bd 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -67,8 +67,8 @@ titles = {
 
     "Interrogate": "Reconstruct prompt from existing image and put it into the prompt field.",
 
-    "Images filename pattern": "Use following tags to define how filenames for images are chosen: [steps], [cfg], [prompt_hash], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [model_name], [prompt_words], [date], [datetime], [datetime<Format>], [datetime<Format><Time Zone>], [job_timestamp]; leave empty for default.",
-    "Directory name pattern": "Use following tags to define how subdirectories for images and grids are chosen: [steps], [cfg],[prompt_hash], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [model_name], [prompt_words], [date], [datetime], [datetime<Format>], [datetime<Format><Time Zone>], [job_timestamp]; leave empty for default.",
+    "Images filename pattern": "Use following tags to define how filenames for images are chosen: [steps], [cfg], [prompt_hash], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [model_name], [prompt_words], [date], [datetime], [datetime<Format>], [datetime<Format><Time Zone>], [job_timestamp], [hasprompt<prompt1|default><prompt2>..]; leave empty for default.",
+    "Directory name pattern": "Use following tags to define how subdirectories for images and grids are chosen: [steps], [cfg],[prompt_hash], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [model_name], [prompt_words], [date], [datetime], [datetime<Format>], [datetime<Format><Time Zone>], [job_timestamp], [hasprompt<prompt1|default><prompt2>..]; leave empty for default.",
     "Max prompt words": "Set the maximum number of words to be used in the [prompt_words] option; ATTENTION: If the words are too long, they may exceed the maximum length of the file path that the system can handle",
 
     "Loopback": "Process an image, use it as an input, repeat.",
-- 
cgit v1.2.1


From 33365f15bf667dc421bd844c372987cf58008daf Mon Sep 17 00:00:00 2001
From: TFWol <9045213+TFWol@users.noreply.github.com>
Date: Wed, 19 Apr 2023 14:23:46 -0700
Subject: Remove old code roll random artists

Removed context menu entry that used to be for rolling artists from the now removed artists.csv.

It was probably meant to be removed at commit 6d805b6.
---
 javascript/contextMenus.js | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'javascript')

diff --git a/javascript/contextMenus.js b/javascript/contextMenus.js
index 06f505b0..9468c107 100644
--- a/javascript/contextMenus.js
+++ b/javascript/contextMenus.js
@@ -161,14 +161,6 @@ addContextMenuEventListener = initResponse[2];
   appendContextMenuOption('#img2img_interrupt','Cancel generate forever',cancelGenerateForever)
   appendContextMenuOption('#img2img_generate', 'Cancel generate forever',cancelGenerateForever)
 
-  appendContextMenuOption('#roll','Roll three',
-    function(){
-      let rollbutton = get_uiCurrentTabContent().querySelector('#roll');
-      setTimeout(function(){rollbutton.click()},100)
-      setTimeout(function(){rollbutton.click()},200)
-      setTimeout(function(){rollbutton.click()},300)
-    }
-  )
 })();
 //End example Context Menu Items
 
-- 
cgit v1.2.1


From e735be8b5b455aa2bd02be0b3c6fe0596ad4ec52 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Wed, 19 Apr 2023 22:04:34 -0600
Subject: Automatically select current word

---
 javascript/edit-attention.js | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

(limited to 'javascript')

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 20a5aadf..1c9f6737 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -17,7 +17,7 @@ function keyupEditAttention(event){
 		// Find opening parenthesis around current cursor
 		const before = text.substring(0, selectionStart);
 		let beforeParen = before.lastIndexOf(OPEN);
-		if (beforeParen == -1) return  false;
+		if (beforeParen == -1) return false;
 		let beforeParenClose = before.lastIndexOf(CLOSE);
 		while (beforeParenClose !== -1 && beforeParenClose > beforeParen) {
 			beforeParen = before.lastIndexOf(OPEN, beforeParen - 1);
@@ -27,7 +27,7 @@ function keyupEditAttention(event){
 		// Find closing parenthesis around current cursor
 		const after = text.substring(selectionStart);
 		let afterParen = after.indexOf(CLOSE);
-		if (afterParen == -1) return  false;
+		if (afterParen == -1) return false;
 		let afterParenOpen = after.indexOf(OPEN);
 		while (afterParenOpen !== -1 && afterParen > afterParenOpen) {
 			afterParen = after.indexOf(CLOSE, afterParen + 1);
@@ -43,10 +43,35 @@ function keyupEditAttention(event){
 		target.setSelectionRange(selectionStart, selectionEnd);
 		return true;
     }
+    
+    function selectCurrentWord(){
+        if (selectionStart !== selectionEnd) return false;
+        
+        // Select the current word, find the start and end of the word (first space before and after)
+        const wordStart = text.substring(0, selectionStart).lastIndexOf(" ") + 1;
+        const wordEnd = text.substring(selectionEnd).indexOf(" ");
+        // If there is no space after the word, select to the end of the string
+        if (wordEnd === -1) {
+            selectionEnd = text.length;
+        } else {
+            selectionEnd += wordEnd;
+        }
+        selectionStart = wordStart;
+
+        // Remove all punctuation at the end and beginning of the word
+        while (text[selectionStart].match(/[.,\/#!$%\^&\*;:{}=\-_`~()]/)) {
+            selectionStart++;
+        }
+        while (text[selectionEnd - 1].match(/[.,\/#!$%\^&\*;:{}=\-_`~()]/)) {
+            selectionEnd--;
+        }
+        target.setSelectionRange(selectionStart, selectionEnd);
+        return true;
+    }
 
-	// If the user hasn't selected anything, let's select their current parenthesis block
-    if(! selectCurrentParenthesisBlock('<', '>')){
-        selectCurrentParenthesisBlock('(', ')')
+	// If the user hasn't selected anything, let's select their current parenthesis block or word
+    if (!selectCurrentParenthesisBlock('<', '>') && !selectCurrentParenthesisBlock('(', ')')) {
+        selectCurrentWord();
     }
 
 	event.preventDefault();
-- 
cgit v1.2.1


From fbd34a68478caa528507fab830e3ac33a26fc6f4 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Thu, 20 Apr 2023 01:12:59 -0600
Subject: Use string.contains() instead of regex

---
 javascript/edit-attention.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'javascript')

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 1c9f6737..01d37074 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -46,6 +46,7 @@ function keyupEditAttention(event){
     
     function selectCurrentWord(){
         if (selectionStart !== selectionEnd) return false;
+        const delimiters = ".,\/#!$%\^&\*;:{}=\-_`~()";
         
         // Select the current word, find the start and end of the word (first space before and after)
         const wordStart = text.substring(0, selectionStart).lastIndexOf(" ") + 1;
@@ -59,10 +60,10 @@ function keyupEditAttention(event){
         selectionStart = wordStart;
 
         // Remove all punctuation at the end and beginning of the word
-        while (text[selectionStart].match(/[.,\/#!$%\^&\*;:{}=\-_`~()]/)) {
+        while (delimiters.includes(text[selectionStart])) {
             selectionStart++;
         }
-        while (text[selectionEnd - 1].match(/[.,\/#!$%\^&\*;:{}=\-_`~()]/)) {
+        while (delimiters.includes(text[selectionEnd - 1])) {
             selectionEnd--;
         }
         target.setSelectionRange(selectionStart, selectionEnd);
-- 
cgit v1.2.1


From ee172c0fc13aeb3a8c1f4a8da63551dcb93fc5ec Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Thu, 20 Apr 2023 01:34:13 -0600
Subject: Simplify finding word boundaries

This also makes it work with prompts without spaces between words
---
 javascript/edit-attention.js | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'javascript')

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 01d37074..80d7c01c 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -46,26 +46,18 @@ function keyupEditAttention(event){
     
     function selectCurrentWord(){
         if (selectionStart !== selectionEnd) return false;
-        const delimiters = ".,\/#!$%\^&\*;:{}=\-_`~()";
+        const delimiters = ".,\/#!$%\^&\*;:{}=\-_`~() ";
         
-        // Select the current word, find the start and end of the word (first space before and after)
-        const wordStart = text.substring(0, selectionStart).lastIndexOf(" ") + 1;
-        const wordEnd = text.substring(selectionEnd).indexOf(" ");
-        // If there is no space after the word, select to the end of the string
-        if (wordEnd === -1) {
-            selectionEnd = text.length;
-        } else {
-            selectionEnd += wordEnd;
+        // seek backward until to find beggining
+        while (!delimiters.includes(text[selectionStart - 1]) && selectionStart > 0) {
+            selectionStart--;
         }
-        selectionStart = wordStart;
-
-        // Remove all punctuation at the end and beginning of the word
-        while (delimiters.includes(text[selectionStart])) {
-            selectionStart++;
-        }
-        while (delimiters.includes(text[selectionEnd - 1])) {
-            selectionEnd--;
+        
+        // seek forward to find end
+        while (!delimiters.includes(text[selectionEnd]) && selectionEnd < text.length) {
+            selectionEnd++;
         }
+
         target.setSelectionRange(selectionStart, selectionEnd);
         return true;
     }
-- 
cgit v1.2.1


From 7ef5551634f8d06301929cb43069f5bf37ee8f1a Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Thu, 20 Apr 2023 02:24:38 -0600
Subject: Update delimiters

---
 javascript/edit-attention.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript')

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 80d7c01c..5fe1117c 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -46,7 +46,7 @@ function keyupEditAttention(event){
     
     function selectCurrentWord(){
         if (selectionStart !== selectionEnd) return false;
-        const delimiters = ".,\/#!$%\^&\*;:{}=\-_`~() ";
+        const delimiters = " .,\\/!?%^*;:{}=-_`~()\r\n\t";
         
         // seek backward until to find beggining
         while (!delimiters.includes(text[selectionStart - 1]) && selectionStart > 0) {
-- 
cgit v1.2.1


From 27d02597c78a1b189c57feea12ba522d61a56c2e Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Fri, 21 Apr 2023 01:37:29 -0600
Subject: Remove parentheses if weight == 1

---
 javascript/edit-attention.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'javascript')

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 5fe1117c..c02d292f 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -99,7 +99,13 @@ function keyupEditAttention(event){
 	weight = parseFloat(weight.toPrecision(12));
 	if(String(weight).length == 1) weight += ".0"
 
-	text = text.slice(0, selectionEnd + 1) + weight + text.slice(selectionEnd + 1 + end - 1);
+    if (closeCharacter == ')' && weight == 1) {
+        text = text.slice(0, selectionStart - 1) + text.slice(selectionStart, selectionEnd) + text.slice(selectionEnd + 5);
+        selectionStart--;
+        selectionEnd--;
+    } else {
+        text = text.slice(0, selectionEnd + 1) + weight + text.slice(selectionEnd + 1 + end - 1);
+    }
 
 	target.focus();
 	target.value = text;
@@ -111,4 +117,4 @@ function keyupEditAttention(event){
 
 addEventListener('keydown', (event) => {
     keyupEditAttention(event);
-});
\ No newline at end of file
+});
-- 
cgit v1.2.1


From c1fdba59045c2191433f9cdf82a1c86dc98e623b Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:44:31 -0600
Subject: Remove hyphen, underscore delimiters

---
 javascript/edit-attention.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript')

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index c02d292f..2307fd7a 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -46,7 +46,7 @@ function keyupEditAttention(event){
     
     function selectCurrentWord(){
         if (selectionStart !== selectionEnd) return false;
-        const delimiters = " .,\\/!?%^*;:{}=-_`~()\r\n\t";
+        const delimiters = " .,\\/!?%^*;:{}=`~()\r\n\t";
         
         // seek backward until to find beggining
         while (!delimiters.includes(text[selectionStart - 1]) && selectionStart > 0) {
-- 
cgit v1.2.1


From 8ae8aeca75debdf83d18416d16869b04fb320451 Mon Sep 17 00:00:00 2001
From: bbonvi <6573230@gmail.com>
Date: Mon, 24 Apr 2023 13:12:49 +0600
Subject: pull progress for 40 seconds

for some extreme network conditions 20 seconds may not be enough
---
 javascript/progressbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript')

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index eb44aab9..8df3f569 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -138,7 +138,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 return
             }
 
-            if(elapsedFromStart > 20 && !res.queued && !res.active){
+            if(elapsedFromStart > 40 && !res.queued && !res.active){
                 removeProgressBar()
                 return
             }
-- 
cgit v1.2.1


From 0e071ae504a8219934b2f35a1d88dcb1f628d7c3 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Fri, 21 Apr 2023 20:19:58 -0600
Subject: Custom delimiters

---
 javascript/edit-attention.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript')

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 2307fd7a..588c7b77 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -46,7 +46,7 @@ function keyupEditAttention(event){
     
     function selectCurrentWord(){
         if (selectionStart !== selectionEnd) return false;
-        const delimiters = " .,\\/!?%^*;:{}=`~()\r\n\t";
+        const delimiters = opts.keyedit_delimiters + " \r\n\t";
         
         // seek backward until to find beggining
         while (!delimiters.includes(text[selectionStart - 1]) && selectionStart > 0) {
-- 
cgit v1.2.1


From 1d11e896984c883f6a0debb3abaef945595cbc70 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 29 Apr 2023 15:57:09 +0300
Subject: rework Negative Guidance minimum sigma to work with AND, add infotext
 and copypaste parameters support

---
 javascript/hints.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'javascript')

diff --git a/javascript/hints.js b/javascript/hints.js
index c6bae360..44d418da 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -111,7 +111,8 @@ titles = {
     "Resize height to": "Resizes image to this height. If 0, height is inferred from either of two nearby sliders.",
     "Multiplier for extra networks": "When adding extra network such as Hypernetwork or Lora to prompt, use this multiplier for it.",
     "Discard weights with matching name": "Regular expression; if weights's name matches it, the weights is not written to the resulting checkpoint. Use ^model_ema to discard EMA weights.",
-    "Extra networks tab order": "Comma-separated list of tab names; tabs listed here will appear in the extra networks UI first and in order lsited."
+    "Extra networks tab order": "Comma-separated list of tab names; tabs listed here will appear in the extra networks UI first and in order lsited.",
+    "Negative Guidance minimum sigma": "Skip negative prompt for steps where image is already mostly denoised; the higher this value, the more skips there will be; provides increased performance in exchange for minor quality reduction."
 }
 
 
-- 
cgit v1.2.1