diff --git a/ui/media/js/image-editor.js b/ui/media/js/image-editor.js index bea3b3ec..e6792cbf 100644 --- a/ui/media/js/image-editor.js +++ b/ui/media/js/image-editor.js @@ -244,8 +244,8 @@ var IMAGE_EDITOR_SECTIONS = [ var sub_element = document.createElement("div") sub_element.style.background = `var(--background-color3)` sub_element.style.filter = `blur(${blur_amount}px)` - sub_element.style.width = `${size - 4}px` - sub_element.style.height = `${size - 4}px` + sub_element.style.width = `${size - 2}px` + sub_element.style.height = `${size - 2}px` sub_element.style['border-radius'] = `${size}px` element.style.background = "none" element.appendChild(sub_element) diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 92003692..ed4e7134 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -1167,12 +1167,10 @@ saveAllImagesBtn.addEventListener('click', (e) => { let req = htmlTaskMap.get(container) container.querySelectorAll(".imgContainer img").forEach(img => { if (img.closest('.imgItem').style.display === 'none') { - // console.log('skipping hidden image', img) return } - onDownloadImageClick(req, img) - // console.log(req) + onDownloadImageClick(req.reqBody, img) }) }) }) diff --git a/ui/media/js/searchable-models.js b/ui/media/js/searchable-models.js index c9cf3ea9..70f1559b 100644 --- a/ui/media/js/searchable-models.js +++ b/ui/media/js/searchable-models.js @@ -346,7 +346,8 @@ class ModelDropdown this.modelList.style.display = 'block' this.selectEntry() this.showAllEntries() - this.modelFilter.value = '' + //this.modelFilter.value = '' + this.modelFilter.select() // preselect the entire string so user can just start typing. this.modelFilter.focus() this.modelFilter.style.cursor = 'auto' } diff --git a/ui/plugins/ui/Autoscroll.plugin.js b/ui/plugins/ui/Autoscroll.plugin.js index 72905c6d..24818ce2 100644 --- a/ui/plugins/ui/Autoscroll.plugin.js +++ b/ui/plugins/ui/Autoscroll.plugin.js @@ -39,7 +39,10 @@ function Autoscroll(target) { if (autoScroll.checked && target !== null) { - target.parentElement.parentElement.parentElement.scrollIntoView(); + const img = target.querySelector('img') + img.addEventListener('load', function() { + img.closest('.imageTaskContainer').scrollIntoView() + }, { once: true }) } } })() diff --git a/ui/plugins/ui/modifiers-toggle.plugin.js b/ui/plugins/ui/modifiers-toggle.plugin.js index e7416164..14eb5627 100644 --- a/ui/plugins/ui/modifiers-toggle.plugin.js +++ b/ui/plugins/ui/modifiers-toggle.plugin.js @@ -40,7 +40,7 @@ // refresh activeTags let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].dataset.fullName activeTags = activeTags.map(obj => { - if (obj.name === modifierName) { + if (trimModifiers(obj.name) === trimModifiers(modifierName)) { return {...obj, inactive: (obj.element.classList.contains('modifier-toggle-inactive'))}; }