Mirror/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2024-06-07 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix refresh button forgetting sort order for extra networks #14588

Browse Source
This commit is contained in:
AUTOMATIC1111 2024-02-02 20:51:54 +03:00
parent 5084b39ea5
commit 1ff1c5be64
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
javascript/extraNetworks.js
View File

@ -48,7 +48,7 @@ function setupExtraNetworksForTab(tabname) {
return; // `return` is equivalent of `continue` but for forEach loops. return; // `return` is equivalent of `continue` but for forEach loops.
} }
var applyFilter = function() { var applyFilter = function(force) {
var searchTerm = search.value.toLowerCase(); var searchTerm = search.value.toLowerCase();
gradioApp().querySelectorAll('#' + tabname + '_extra_tabs div.card').forEach(function(elem) { gradioApp().querySelectorAll('#' + tabname + '_extra_tabs div.card').forEach(function(elem) {
var searchOnly = elem.querySelector('.search_only'); var searchOnly = elem.querySelector('.search_only');
@ -67,17 +67,17 @@ function setupExtraNetworksForTab(tabname) {
} }
}); });
applySort(); applySort(force);
}; };
var applySort = function() { var applySort = function(force) {
var cards = gradioApp().querySelectorAll('#' + tabname + '_extra_tabs div.card'); var cards = gradioApp().querySelectorAll('#' + tabname + '_extra_tabs div.card');
var reverse = sort_dir.dataset.sortdir == "Descending"; var reverse = sort_dir.dataset.sortdir == "Descending";
var sortKey = sort_mode.dataset.sortmode.toLowerCase().replace("sort", "").replaceAll(" ", "_").replace(/_+$/, "").trim() || "name"; var sortKey = sort_mode.dataset.sortmode.toLowerCase().replace("sort", "").replaceAll(" ", "_").replace(/_+$/, "").trim() || "name";
sortKey = "sort" + sortKey.charAt(0).toUpperCase() + sortKey.slice(1); sortKey = "sort" + sortKey.charAt(0).toUpperCase() + sortKey.slice(1);
var sortKeyStore = sortKey + "-" + (reverse ? "Descending" : "Ascending") + "-" + cards.length; var sortKeyStore = sortKey + "-" + (reverse ? "Descending" : "Ascending") + "-" + cards.length;
if (sortKeyStore == sort_mode.dataset.sortkey) { if (sortKeyStore == sort_mode.dataset.sortkey && !force) {
return; return;
} }
sort_mode.dataset.sortkey = sortKeyStore; sort_mode.dataset.sortkey = sortKeyStore;
@ -167,11 +167,17 @@ function extraNetworksTabSelected(tabname, id, showPrompt, showNegativePrompt, t
} }
function applyExtraNetworkFilter(tabname_full) { function applyExtraNetworkFilter(tabname_full) {
setTimeout(extraNetworksApplyFilter[tabname_full], 1); var doFilter = function() {
extraNetworksApplyFilter[tabname_full](true);
};
setTimeout(doFilter, 1);
} }
function applyExtraNetworkSort(tabname_full) { function applyExtraNetworkSort(tabname_full) {
setTimeout(extraNetworksApplySort[tabname_full], 1); var doSort = function() {
extraNetworksApplySort[tabname_full](true);
};
setTimeout(doSort, 1);
} }
var extraNetworksApplyFilter = {}; var extraNetworksApplyFilter = {};

2
javascript/ui.js
View File

@ -126,7 +126,7 @@ function setSubmitButtonsVisibility(tabname, showInterrupt, showSkip, showInterr
} }
function showSubmitButtons(tabname, show) { function showSubmitButtons(tabname, show) {
setSubmitButtonsVisibility(tabname, ! show, !show, false); setSubmitButtonsVisibility(tabname, !show, !show, false);
} }
function showSubmitInterruptingPlaceholder(tabname) { function showSubmitInterruptingPlaceholder(tabname) {