StableDiffusion/WebUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the issue with incorrect js options on page load

Browse Source 
add a setting for lightbox max size images
use setting for lightbox max size images late to let user change it and see results
This commit is contained in:
AUTOMATIC 2022-09-19 17:16:04 +03:00
parent bf1f3b8daf
commit 028fc25f28
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
javascript/imageviewer.js
View File

@ -71,6 +71,7 @@ function showGalleryImage(){
e.addEventListener('click', function (evt) { e.addEventListener('click', function (evt) {
if(!opts.js_modal_lightbox) return; if(!opts.js_modal_lightbox) return;
modalZoomSet(gradioApp().getElementById('modalImage'), opts.js_modal_lightbox_initialy_zoomed)
showModal(evt) showModal(evt)
},true); },true);
} }
@ -80,13 +81,17 @@ function showGalleryImage(){
}, 100); }, 100);
} }
function modalZoomToggle(event){ function modalZoomSet(modalImage, enable){
modalImage = gradioApp().getElementById("modalImage"); if( enable ){
if( !modalImage.classList.contains('modalImageFullscreen') ){
modalImage.classList.add('modalImageFullscreen'); modalImage.classList.add('modalImageFullscreen');
}else{ } else{
modalImage.classList.remove('modalImageFullscreen'); modalImage.classList.remove('modalImageFullscreen');
} }
}
function modalZoomToggle(event){
modalImage = gradioApp().getElementById("modalImage");
modalZoomSet(modalImage, !modalImage.classList.contains('modalImageFullscreen'))
event.stopPropagation() event.stopPropagation()
} }
@ -101,18 +106,6 @@ onUiUpdate(function(){
if(fullImg_preview != null){ if(fullImg_preview != null){
fullImg_preview.forEach(galleryImageHandler); fullImg_preview.forEach(galleryImageHandler);
} }
if(Object.keys(opts).length == 0) return;
if(!window.lightbox_settings_applied){
window.lightbox_settings_applied = true;
if(opts.js_modal_lightbox_initialy_zoomed){
var imageModal = gradioApp().getElementById('modalImage');
if(imageModal){
imageModal.className = 'modalImageFullscreen';
}
}
}
}) })
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {

1
modules/shared.py
View File

@ -160,6 +160,7 @@ class Options:
"interrogate_clip_dict_limit": OptionInfo(1500, "Interrogate: maximum number of lines in text file (0 = No limit)"), "interrogate_clip_dict_limit": OptionInfo(1500, "Interrogate: maximum number of lines in text file (0 = No limit)"),
"sd_model_checkpoint": OptionInfo(None, "Stable Diffusion checkpoint", gr.Radio, lambda: {"choices": [x.title for x in modules.sd_models.checkpoints_list.values()]}), "sd_model_checkpoint": OptionInfo(None, "Stable Diffusion checkpoint", gr.Radio, lambda: {"choices": [x.title for x in modules.sd_models.checkpoints_list.values()]}),
"js_modal_lightbox": OptionInfo(True, "Enable full page image viewer"), "js_modal_lightbox": OptionInfo(True, "Enable full page image viewer"),
"js_modal_lightbox_initialy_zoomed": OptionInfo(True, "Show images zoomed in by default in full page image viewer"),
} }
def __init__(self): def __init__(self):

2
modules/ui.py
View File

@ -900,7 +900,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo):
with gr.TabItem(label, id=ifid): with gr.TabItem(label, id=ifid):
interface.render() interface.render()
text_settings = gr.Textbox(elem_id="settings_json", value=opts.dumpjson(), visible=False) text_settings = gr.Textbox(elem_id="settings_json", value=lambda: opts.dumpjson(), visible=False)
settings_submit.click( settings_submit.click(
fn=lambda: opts.dumpjson(), fn=lambda: opts.dumpjson(),