Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta

This commit is contained in:
cmdr2 2023-02-20 19:31:57 +05:30
commit 2f0e8a8a4a
5 changed files with 10 additions and 8 deletions

View File

@ -244,8 +244,8 @@ var IMAGE_EDITOR_SECTIONS = [
var sub_element = document.createElement("div") var sub_element = document.createElement("div")
sub_element.style.background = `var(--background-color3)` sub_element.style.background = `var(--background-color3)`
sub_element.style.filter = `blur(${blur_amount}px)` sub_element.style.filter = `blur(${blur_amount}px)`
sub_element.style.width = `${size - 4}px` sub_element.style.width = `${size - 2}px`
sub_element.style.height = `${size - 4}px` sub_element.style.height = `${size - 2}px`
sub_element.style['border-radius'] = `${size}px` sub_element.style['border-radius'] = `${size}px`
element.style.background = "none" element.style.background = "none"
element.appendChild(sub_element) element.appendChild(sub_element)

View File

@ -1167,12 +1167,10 @@ saveAllImagesBtn.addEventListener('click', (e) => {
let req = htmlTaskMap.get(container) let req = htmlTaskMap.get(container)
container.querySelectorAll(".imgContainer img").forEach(img => { container.querySelectorAll(".imgContainer img").forEach(img => {
if (img.closest('.imgItem').style.display === 'none') { if (img.closest('.imgItem').style.display === 'none') {
// console.log('skipping hidden image', img)
return return
} }
onDownloadImageClick(req, img) onDownloadImageClick(req.reqBody, img)
// console.log(req)
}) })
}) })
}) })

View File

@ -346,7 +346,8 @@ class ModelDropdown
this.modelList.style.display = 'block' this.modelList.style.display = 'block'
this.selectEntry() this.selectEntry()
this.showAllEntries() 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.focus()
this.modelFilter.style.cursor = 'auto' this.modelFilter.style.cursor = 'auto'
} }

View File

@ -39,7 +39,10 @@
function Autoscroll(target) { function Autoscroll(target) {
if (autoScroll.checked && target !== null) { 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 })
} }
} }
})() })()

View File

@ -40,7 +40,7 @@
// refresh activeTags // refresh activeTags
let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].dataset.fullName let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].dataset.fullName
activeTags = activeTags.map(obj => { activeTags = activeTags.map(obj => {
if (obj.name === modifierName) { if (trimModifiers(obj.name) === trimModifiers(modifierName)) {
return {...obj, inactive: (obj.element.classList.contains('modifier-toggle-inactive'))}; return {...obj, inactive: (obj.element.classList.contains('modifier-toggle-inactive'))};
} }