Commit cd122565 authored by Kohaku-Blueleaf's avatar Kohaku-Blueleaf
Browse files

Merge branch 'dev' into test-fp8

parents c3facab4 5e80d9ee

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line 
## 1.6.1



### Bug Fixes:

 * fix an error causing the webui to fail to start ([#13839](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/13839))



## 1.6.0



### Features:

README.md

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ A browser interface based on Gradio library for Stable Diffusion. 
- Eased resolution restriction: generated image's dimensions must be a multiple of 8 rather than 64

- Now with a license!

- Reorder elements in the UI from settings screen

- [Segmind Stable Diffusion](https://huggingface.co/segmind/SSD-1B) support



## Installation and Running

Make sure the required [dependencies](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Dependencies) are met and follow the instructions available for:

extensions-builtin/mobile/javascript/mobile.js

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ function isMobile() { 
}



function reportWindowSize() {

    if (gradioApp().querySelector('.toprow-compact-tools')) return; // not applicable for compact prompt layout



    var currentlyMobile = isMobile();

    if (currentlyMobile == isSetupForMobile) return;

    isSetupForMobile = currentlyMobile;

javascript/extraNetworks.js

+49 −11
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ function setupExtraNetworksForTab(tabname) { 
    var refresh = gradioApp().getElementById(tabname + '_extra_refresh');

    var showDirsDiv = gradioApp().getElementById(tabname + '_extra_show_dirs');

    var showDirs = gradioApp().querySelector('#' + tabname + '_extra_show_dirs input');

    var promptContainer = gradioApp().querySelector('.prompt-container-compact#' + tabname + '_prompt_container');

    var negativePrompt = gradioApp().querySelector('#' + tabname + '_neg_prompt');



    sort.dataset.sortkey = 'sortDefault';

    tabs.appendChild(searchDiv);

    tabs.appendChild(sort);

    tabs.appendChild(sortOrder);
@@ -49,20 +50,23 @@ function setupExtraNetworksForTab(tabname) { 


            elem.style.display = visible ? "" : "none";

        });



        applySort();

    };



    var applySort = function() {

        var cards = gradioApp().querySelectorAll('#' + tabname + '_extra_tabs div.card');



        var reverse = sortOrder.classList.contains("sortReverse");

        var sortKey = sort.querySelector("input").value.toLowerCase().replace("sort", "").replaceAll(" ", "_").replace(/_+$/, "").trim();

        sortKey = sortKey ? "sort" + sortKey.charAt(0).toUpperCase() + sortKey.slice(1) : "";

        var sortKeyStore = sortKey ? sortKey + (reverse ? "Reverse" : "") : "";

        if (!sortKey || sortKeyStore == sort.dataset.sortkey) {

        var sortKey = sort.querySelector("input").value.toLowerCase().replace("sort", "").replaceAll(" ", "_").replace(/_+$/, "").trim() || "name";

        sortKey = "sort" + sortKey.charAt(0).toUpperCase() + sortKey.slice(1);

        var sortKeyStore = sortKey + "-" + (reverse ? "Descending" : "Ascending") + "-" + cards.length;



        if (sortKeyStore == sort.dataset.sortkey) {

            return;

        }



        sort.dataset.sortkey = sortKeyStore;



        var cards = gradioApp().querySelectorAll('#' + tabname + '_extra_tabs div.card');

        cards.forEach(function(card) {

            card.originalParentElement = card.parentElement;

        });
@@ -88,15 +92,13 @@ function setupExtraNetworksForTab(tabname) { 
    };



    search.addEventListener("input", applyFilter);

    applyFilter();

    ["change", "blur", "click"].forEach(function(evt) {

        sort.querySelector("input").addEventListener(evt, applySort);

    });

    sortOrder.addEventListener("click", function() {

        sortOrder.classList.toggle("sortReverse");

        applySort();

    });

    applyFilter();



    extraNetworksApplySort[tabname] = applySort;

    extraNetworksApplyFilter[tabname] = applyFilter;



    var showDirsUpdate = function() {
@@ -109,11 +111,47 @@ function setupExtraNetworksForTab(tabname) { 
    showDirsUpdate();

}



function extraNetworksMovePromptToTab(tabname, id, showPrompt, showNegativePrompt) {

    if (!gradioApp().querySelector('.toprow-compact-tools')) return; // only applicable for compact prompt layout



    var promptContainer = gradioApp().getElementById(tabname + '_prompt_container');

    var prompt = gradioApp().getElementById(tabname + '_prompt_row');

    var negPrompt = gradioApp().getElementById(tabname + '_neg_prompt_row');

    var elem = id ? gradioApp().getElementById(id) : null;



    if (showNegativePrompt && elem) {

        elem.insertBefore(negPrompt, elem.firstChild);

    } else {

        promptContainer.insertBefore(negPrompt, promptContainer.firstChild);

    }



    if (showPrompt && elem) {

        elem.insertBefore(prompt, elem.firstChild);

    } else {

        promptContainer.insertBefore(prompt, promptContainer.firstChild);

    }

}





function extraNetworksUrelatedTabSelected(tabname) { // called from python when user selects an unrelated tab (generate)

    extraNetworksMovePromptToTab(tabname, '', false, false);

}



function extraNetworksTabSelected(tabname, id, showPrompt, showNegativePrompt) { // called from python when user selects an extra networks tab

    extraNetworksMovePromptToTab(tabname, id, showPrompt, showNegativePrompt);



}



function applyExtraNetworkFilter(tabname) {

    setTimeout(extraNetworksApplyFilter[tabname], 1);

}



function applyExtraNetworkSort(tabname) {

    setTimeout(extraNetworksApplySort[tabname], 1);

}



var extraNetworksApplyFilter = {};

var extraNetworksApplySort = {};

var activePromptTextarea = {};



function setupExtraNetworks() {

javascript/inputAccordion.js

+56 −25
Original line number Diff line number Diff line 
var observerAccordionOpen = new MutationObserver(function(mutations) {

    mutations.forEach(function(mutationRecord) {

        var elem = mutationRecord.target;

        var open = elem.classList.contains('open');

function inputAccordionChecked(id, checked) {

    var accordion = gradioApp().getElementById(id);

    accordion.visibleCheckbox.checked = checked;

    accordion.onVisibleCheckboxChange();

}



        var accordion = elem.parentNode;

        accordion.classList.toggle('input-accordion-open', open);

function setupAccordion(accordion) {

    var labelWrap = accordion.querySelector('.label-wrap');

    var gradioCheckbox = gradioApp().querySelector('#' + accordion.id + "-checkbox input");

    var extra = gradioApp().querySelector('#' + accordion.id + "-extra");

    var span = labelWrap.querySelector('span');

    var linked = true;



        var checkbox = gradioApp().querySelector('#' + accordion.id + "-checkbox input");

        checkbox.checked = open;

        updateInput(checkbox);

    var isOpen = function() {

        return labelWrap.classList.contains('open');

    };



        var extra = gradioApp().querySelector('#' + accordion.id + "-extra");

        if (extra) {

            extra.style.display = open ? "" : "none";

    var observerAccordionOpen = new MutationObserver(function(mutations) {

        mutations.forEach(function(mutationRecord) {

            accordion.classList.toggle('input-accordion-open', isOpen());



            if (linked) {

                accordion.visibleCheckbox.checked = isOpen();

                accordion.onVisibleCheckboxChange();

            }

        });

    });

    observerAccordionOpen.observe(labelWrap, {attributes: true, attributeFilter: ['class']});



function inputAccordionChecked(id, checked) {

    var label = gradioApp().querySelector('#' + id + " .label-wrap");

    if (label.classList.contains('open') != checked) {

        label.click();

    if (extra) {

        labelWrap.insertBefore(extra, labelWrap.lastElementChild);

    }



    accordion.onChecked = function(checked) {

        if (isOpen() != checked) {

            labelWrap.click();

        }

    };



onUiLoaded(function() {

    for (var accordion of gradioApp().querySelectorAll('.input-accordion')) {

        var labelWrap = accordion.querySelector('.label-wrap');

        observerAccordionOpen.observe(labelWrap, {attributes: true, attributeFilter: ['class']});

    var visibleCheckbox = document.createElement('INPUT');

    visibleCheckbox.type = 'checkbox';

    visibleCheckbox.checked = isOpen();

    visibleCheckbox.id = accordion.id + "-visible-checkbox";

    visibleCheckbox.className = gradioCheckbox.className + " input-accordion-checkbox";

    span.insertBefore(visibleCheckbox, span.firstChild);



        var extra = gradioApp().querySelector('#' + accordion.id + "-extra");

        if (extra) {

            labelWrap.insertBefore(extra, labelWrap.lastElementChild);

    accordion.visibleCheckbox = visibleCheckbox;

    accordion.onVisibleCheckboxChange = function() {

        if (linked && isOpen() != visibleCheckbox.checked) {

            labelWrap.click();

        }



        gradioCheckbox.checked = visibleCheckbox.checked;

        updateInput(gradioCheckbox);

    };



    visibleCheckbox.addEventListener('click', function(event) {

        linked = false;

        event.stopPropagation();

    });

    visibleCheckbox.addEventListener('input', accordion.onVisibleCheckboxChange);

}



onUiLoaded(function() {

    for (var accordion of gradioApp().querySelectorAll('.input-accordion')) {

        setupAccordion(accordion);

    }

});

CRA Git | Maintained and supported by SUSTech CRA and CCSE