Merge branch 'dev' into extension-settings-backup

6 files changed, 44 insertions, 25 deletions

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

 

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 20a5aadf..588c7b77 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,28 @@ function keyupEditAttention(event){
 		target.setSelectionRange(selectionStart, selectionEnd);

 		return true;

     }

+    

+    function selectCurrentWord(){

+        if (selectionStart !== selectionEnd) return false;

+        const delimiters = opts.keyedit_delimiters + " \r\n\t";

+        

+        // seek backward until to find beggining

+        while (!delimiters.includes(text[selectionStart - 1]) && selectionStart > 0) {

+            selectionStart--;

+        }

+        

+        // seek forward to find end

+        while (!delimiters.includes(text[selectionEnd]) && selectionEnd < text.length) {

+            selectionEnd++;

+        }

 

-	// If the user hasn't selected anything, let's select their current parenthesis block

-    if(! selectCurrentParenthesisBlock('<', '>')){

-        selectCurrentParenthesisBlock('(', ')')

+        target.setSelectionRange(selectionStart, selectionEnd);

+        return true;

+    }

+

+	// If the user hasn't selected anything, let's select their current parenthesis block or word

+    if (!selectCurrentParenthesisBlock('<', '>') && !selectCurrentParenthesisBlock('(', ')')) {

+        selectCurrentWord();

     }

 

 	event.preventDefault();

@@ -81,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;

@@ -93,4 +117,4 @@ function keyupEditAttention(event){
 

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

     keyupEditAttention(event);

-});
\ No newline at end of file
+});

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()
 	});
 });
 
diff --git a/javascript/hints.js b/javascript/hints.js
index f48a0eb6..fa023585 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -65,8 +65,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": "Performs img2img processing multiple times. Output images are used as input for the next loop.",
@@ -85,7 +85,6 @@ titles = {
     "vram": "Torch active: Peak amount of VRAM used by Torch during generation, excluding cached data.\nTorch reserved: Peak amount of VRAM allocated by Torch, including all active and cached data.\nSys VRAM: Peak amount of VRAM allocation across all applications / total GPU VRAM (peak utilization%).",
 
     "Eta noise seed delta": "If this values is non-zero, it will be added to seed and used to initialize RNG for noises when using samplers with Eta. You can use this to produce even more variation of images, or you can use this to match images of other software if you know what you are doing.",
-    "Do not add watermark to images": "If this option is enabled, watermark will not be added to created images. Warning: if you do not add watermark, you may be behaving in an unethical manner.",
 
     "Filename word regex": "This regular expression will be used extract words from filename, and they will be joined using the option below into label text used for training. Leave empty to keep filename text as it is.",
     "Filename join string": "This string will be used to join split words into a single line if the option above is enabled.",
@@ -111,7 +110,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."
 }
 
 
diff --git a/javascript/imageviewer.js b/javascript/imageviewer.js
index d6483562..3deffa9b 100644
--- a/javascript/imageviewer.js
+++ b/javascript/imageviewer.js
@@ -251,8 +251,11 @@ document.addEventListener("DOMContentLoaded", function() {
 
     modal.appendChild(modalNext)
 
-    gradioApp().appendChild(modal)
-
+    try {
+		gradioApp().appendChild(modal);
+	} catch (e) {
+		gradioApp().body.appendChild(modal);
+	}
 
     document.body.appendChild(modal);
 
diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 4ac9b8db..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 > 5 && !res.queued && !res.active){
+            if(elapsedFromStart > 40 && !res.queued && !res.active){
                 removeProgressBar()
                 return
             }