mirrors/stable-diffusion-webui
1
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2026-02-05 07:12:18 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix more bugs. not happy with how refreshing completely regenerates html. maybe should only update the data json. also maybe look into sharing data json between img2img and txt2img to reduce size of dom.

Browse source
This commit is contained in:
Sj-Si 2024-03-25 16:43:29 -04:00
parent d06990174d
commit b5f3a85f86
5 changed files with 88 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

34
javascript/extraNetworks.js
View file

@ -191,11 +191,11 @@ function extraNetworksRefreshTab(tabname_full) {
let btn_tree_view = gradioApp().querySelector(`#${tabname_full}_extra_tree_view`);
let div_dirs = gradioApp().querySelector(`#${tabname_full}_dirs`);
let div_tree = gradioApp().querySelector(`#${tabname_full}_tree_list_scroll_area`);
let div_tree = gradioApp().querySelector(`.extra-network-content.resize-handle-col:has(> #${tabname_full}_tree_list_scroll_area)`);
// Remove "hidden" class if button is enabled, otherwise add it.
div_dirs.classList.toggle("hidden", !btn_dirs_view.classList.contains("extra-network-control--enabled"));
div_tree.classList.toggle("hidden", !btn_tree_view.classList.contains("extra-network-control--enabled"));
div_dirs.classList.toggle("hidden", !("selected" in btn_dirs_view.dataset));
div_tree.classList.toggle("hidden", !("selected" in btn_tree_view.dataset));
waitForKeyInObject({ k: tabname_full, obj: clusterizers })
.then(() => extraNetworkClusterizersOnTabLoad(tabname_full));
@ -615,11 +615,11 @@ function extraNetworksControlSearchClearOnClick(event, tabname_full) {
function extraNetworksControlSortModeOnClick(event, tabname_full) {
/** Handles `onclick` events for Sort Mode buttons. */
event.currentTarget.parentElement.querySelectorAll('.extra-network-control--sort-mode').forEach(function (x) {
x.classList.remove('extra-network-control--enabled');
event.currentTarget.parentElement.querySelectorAll('.extra-network-control--sort-mode').forEach(elem => {
delete elem.dataset.selected;
});
event.currentTarget.classList.add('extra-network-control--enabled');
event.currentTarget.dataset.selected = "";
if (tabname_full in clusterizers) {
clusterizers[tabname_full].cards_list.setSortMode(
@ -654,9 +654,14 @@ function extraNetworksControlTreeViewOnClick(event, tabname_full) {
*
* Toggles the tree view in the extra networks pane.
*/
var button = event.currentTarget;
button.classList.toggle("extra-network-control--enabled");
var show = button.classList.contains("extra-network-control--enabled");
let show;
if ("selected" in event.currentTarget.dataset) {
delete event.currentTarget.dataset.selected;
show = false;
} else {
event.currentTarget.dataset.selected = "";
show = true;
}
gradioApp().getElementById(`${tabname_full}_tree_list_scroll_area`).parentElement.classList.toggle("hidden", !show);
clusterizers[tabname_full].tree_list.enable(show);
@ -667,9 +672,14 @@ function extraNetworksControlDirsViewOnClick(event, tabname_full) {
*
* Toggles the directory view in the extra networks pane.
*/
var button = event.currentTarget;
button.classList.toggle("extra-network-control--enabled");
var show = button.classList.contains("extra-network-control--enabled");
let show;
if ("selected" in event.currentTarget.dataset) {
delete event.currentTarget.dataset.selected;
show = false;
} else {
event.currentTarget.dataset.selected = "";
show = true;
}
gradioApp().getElementById(`${tabname_full}_dirs`).classList.toggle("hidden", !show);
}

13
javascript/extraNetworksClusterizeList.js
View file

@ -222,16 +222,19 @@ class ExtraNetworksClusterize {
this.data_obj = {};
this.data_obj_keys_sorted = [];
this.clear();
this.content_elem.innerHTML = "<div class='clusterize-no-data'>Loading...</div>";
}
return v;
})
.then(v => decompress(v))
.then(v => JSON.parse(v))
.then(v => this.updateJson(v))
.then(() => this.encoded_str = encoded_str)
.then(() => this.rebuild())
.then(() => this.applyFilter())
.then(() => { return resolve(); });
.then(() => {
this.encoded_str = encoded_str;
this.rebuild();
this.applyFilter();
return resolve();
});
});
}
@ -454,6 +457,7 @@ class ExtraNetworksClusterize {
scrollId: this.scroll_id,
contentId: this.content_id,
rows_in_block: this.rows_in_block,
tag: "div",
blocks_in_cluster: this.blocks_in_cluster,
show_no_data_row: this.show_no_data_row,
no_data_text: this.no_data_text,
@ -822,6 +826,7 @@ class ExtraNetworksClusterizeCardsList extends ExtraNetworksClusterize {
updateJson(json) {
/** Processes JSON object and adds each entry to our data object. */
return new Promise(resolve => {
this.data_obj = {};
for (const [i, [k, v]] of Object.entries(Object.entries(json))) {
let div_id = k;
let parsed_html = htmlStringToElement(v);