images history fix all known bug

5 files changed, 40 insertions, 41 deletions

diff --git a/.gitignore b/.gitignore
index 434e23ce..b9e23112 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ notification.mp3
 /SwinIR
 /textual_inversion
 /images_history_testui.py
+/repositorieslatent-diffusion
diff --git a/javascript/images_history.js b/javascript/images_history.js
index 8fa4a15e..3a20056b 100644
--- a/javascript/images_history.js
+++ b/javascript/images_history.js
@@ -25,11 +25,6 @@ var images_history_click_tab = function(){
     }                
 }
 
-var images_history_close_full_view = function(){
-    var box = images_history_get_parent_by_class(this, "images_history_cantainor");
-    box.querySelector(".images_history_del_button").setAttribute("disabled", "disabled");
-}
-
 function images_history_disabled_del(){
     gradioApp().querySelectorAll(".images_history_del_button").forEach(function(btn){
         btn.setAttribute('disabled','disabled');
@@ -182,18 +177,18 @@ setTimeout(images_history_init, 500);
 document.addEventListener("DOMContentLoaded", function() {
     var mutationObserver = new MutationObserver(function(m){
         for (var i in images_history_tab_list ){
-            var buttons = gradioApp().querySelectorAll('#' + images_history_tab_list[i] + '_images_history .gallery-item');
+            let tabname = images_history_tab_list[i]
+            var buttons = gradioApp().querySelectorAll('#' + tabname + '_images_history .gallery-item');
             buttons.forEach(function(bnt){    
                 bnt.addEventListener('click', images_history_click_image, true);
             });
-        // var cls_btn = gradioApp().getElementById(tabname + '_images_history_gallery').querySelector("svg");
-        // if (cls_btn){
-        //     cls_btn.addEventListener('click', images_history_close_full_view, false);
-        // }
-        // console.log(cls_btn, cls_btn.parentElement.parentElement)
-        // if (cls_btn) {
-        //     cls_btn = images_history_get_parent_by_tagname(cls_btn, "BUTTON");
-        //     cls_btn.addEventListener('click', images_history_close_full_view, true);
+            var cls_btn = gradioApp().getElementById(tabname + '_images_history_gallery').querySelector("svg");
+            if (cls_btn){
+                cls_btn.addEventListener('click', function(){
+                    gradioApp().getElementById(tabname + '_images_history_renew_page').click();
+                }, false);
+            }
+
         }     
     });
     mutationObserver.observe( gradioApp(), { childList:true, subtree:true });
diff --git a/modules/images_history.py b/modules/images_history.py
index f812ea4e..cdfcffed 100644
--- a/modules/images_history.py
+++ b/modules/images_history.py
@@ -38,7 +38,7 @@ def get_recent_images(dir_name, page_index, step, image_index, tabname):
     else:
         current_file =  file_list[int(image_index)]
         hide_image = os.path.join(dir_name, current_file)
-    return [os.path.join(dir_name, file) for file in file_list], page_index, file_list, current_file, hide_image
+    return [os.path.join(dir_name, file) for file in file_list], page_index, file_list, current_file, hide_image, ""
 def first_page_click(dir_name, page_index, image_index, tabname):
     return get_recent_images(dir_name, 1, 0, image_index, tabname)
 def end_page_click(dir_name, page_index, image_index, tabname):
@@ -55,25 +55,28 @@ def show_image_info(num, image_path, filenames):
     file = filenames[int(num)]
     return file, num, os.path.join(image_path, file)
 def delete_image(delete_num, tabname, dir_name, name, page_index, filenames, image_index):
-    delete_num = int(delete_num)
-    index = list(filenames).index(name)
-    i = 0
-    new_file_list = []
-    for name in filenames:
-        if i  >= index and i < index + delete_num:            
-            path = os.path.join(dir_name, name)
-            if os.path.exists(path):        
-                print(f"Delete file {path}")
-                os.remove(path)
-                txt_file = os.path.splitext(path)[0]  + ".txt"
-                if os.path.exists(txt_file):
-                    os.remove(txt_file)       
+    if name == "":
+        return filenames, delete_num
+    else:
+        delete_num = int(delete_num)
+        index = list(filenames).index(name)
+        i = 0
+        new_file_list = []
+        for name in filenames:
+            if i  >= index and i < index + delete_num:            
+                path = os.path.join(dir_name, name)
+                if os.path.exists(path):        
+                    print(f"Delete file {path}")
+                    os.remove(path)
+                    txt_file = os.path.splitext(path)[0]  + ".txt"
+                    if os.path.exists(txt_file):
+                        os.remove(txt_file)       
+                else:
+                    print(f"Not exists file {path}")
             else:
-                print(f"Not exists file {path}")
-        else:
-            new_file_list.append(name)
-        i += 1
-    return page_index, new_file_list, 1
+                new_file_list.append(name)
+            i += 1
+    return new_file_list, 1
 
 def show_images_history(gr, opts, tabname, run_pnginfo, switch_dict):
         if tabname == "txt2img":
@@ -93,9 +96,9 @@ def show_images_history(gr, opts, tabname, run_pnginfo, switch_dict):
             with gr.Row():     
                 with gr.Column(scale=2):                    
                     history_gallery = gr.Gallery(show_label=False, elem_id=tabname + "_images_history_gallery").style(grid=6)
-                    with gr.Row():
-                        delete = gr.Button('Delete',  elem_id=tabname + "_images_history_del_button")
-                        delete_num = gr.Number(value=1, interactive=True, label="number of images to delete consecutively next")                                           
+                    with gr.Row():                        
+                        delete_num = gr.Number(value=1, interactive=True, label="number of images to delete consecutively next")   
+                        delete = gr.Button('Delete',  elem_id=tabname + "_images_history_del_button")                                        
                 with gr.Column():     
                     with gr.Row():          
                         pnginfo_send_to_txt2img = gr.Button('Send to txt2img')
@@ -118,7 +121,7 @@ def show_images_history(gr, opts, tabname, run_pnginfo, switch_dict):
                 
         # turn pages
         gallery_inputs = [img_path, page_index, image_index, tabname_box]
-        gallery_outputs = [history_gallery, page_index, filenames, img_file_name, hide_image]
+        gallery_outputs = [history_gallery, page_index, filenames, img_file_name, hide_image, img_file_name]
 
         first_page.click(first_page_click, _js="images_history_turnpage", inputs=gallery_inputs, outputs=gallery_outputs)
         next_page.click(next_page_click, _js="images_history_turnpage", inputs=gallery_inputs, outputs=gallery_outputs)
@@ -131,7 +134,7 @@ def show_images_history(gr, opts, tabname, run_pnginfo, switch_dict):
         #other funcitons
         set_index.click(show_image_info, _js="images_history_get_current_img", inputs=[tabname_box,  img_path, filenames], outputs=[img_file_name, image_index, hide_image])
         img_file_name.change(fn=None, _js="images_history_enable_del_buttons", inputs=None, outputs=None)
-        delete.click(delete_image,_js="images_history_delete", inputs=[delete_num, tabname_box, img_path, img_file_name, page_index, filenames, image_index], outputs=[page_index, filenames, delete_num]) 
+        delete.click(delete_image,_js="images_history_delete", inputs=[delete_num, tabname_box, img_path, img_file_name, page_index, filenames, image_index], outputs=[filenames, delete_num]) 
         hide_image.change(fn=run_pnginfo, inputs=[hide_image], outputs=[info1, img_file_info, info2])
        
         #pnginfo.click(fn=run_pnginfo, inputs=[hide_image], outputs=[info1, img_file_info, info2])
diff --git a/repositorieslatent-diffusion b/repositorieslatent-diffusion
deleted file mode 160000
-Subproject abf33e7002d59d9085081bce93ec798dcabd49a
diff --git a/style.css b/style.css
index c75dce4c..e6fa10b4 100644
--- a/style.css
+++ b/style.css
@@ -20,7 +20,7 @@
     padding-right: 0.25em;

     margin: 0.1em 0;

     opacity: 0%;

-    cursor: default;    

+    cursor: default;	

 }

 

 .output-html p {margin: 0 0.5em;}

@@ -442,7 +442,7 @@ input[type="range"]{
 }

 

 .red {

-    color: red;

+	color: red;

 }

 

 .gallery-item {

@@ -505,4 +505,4 @@ canvas[key="mask"] {
     top: -0.6em;

     z-index: 200;

     width: 8em;

-}
\ No newline at end of file
+}