From 5251733c0d6939c8d5ba71168e124634872c8dcd Mon Sep 17 00:00:00 2001 From: AUTOMATIC1111 <16777216c@gmail.com> Date: Sat, 9 Mar 2024 07:24:25 +0300 Subject: [PATCH] use natural sort in extra networks when ordering by path --- javascript/extraNetworks.js | 12 ++++-------- style.css | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index 4d891b245..a816f4981 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -406,25 +406,21 @@ function extraNetworksControlSortOnClick(event, tabname, extra_networks_tabname) * @param extra_networks_tabname The id of the active extraNetworks tab. Ex: lora, checkpoints, etc. */ var curr_mode = event.currentTarget.dataset.sortmode; - var el_sort_dir = gradioApp().querySelector("#" + tabname + "_" + extra_networks_tabname + "_extra_sort_dir"); - var sort_dir = el_sort_dir.dataset.sortdir; - if (curr_mode == "path") { + + if (curr_mode == "default") { event.currentTarget.dataset.sortmode = "name"; - event.currentTarget.dataset.sortkey = "sortName-" + sort_dir + "-640"; event.currentTarget.setAttribute("title", "Sort by filename"); } else if (curr_mode == "name") { event.currentTarget.dataset.sortmode = "date_created"; - event.currentTarget.dataset.sortkey = "sortDate_created-" + sort_dir + "-640"; event.currentTarget.setAttribute("title", "Sort by date created"); } else if (curr_mode == "date_created") { event.currentTarget.dataset.sortmode = "date_modified"; - event.currentTarget.dataset.sortkey = "sortDate_modified-" + sort_dir + "-640"; event.currentTarget.setAttribute("title", "Sort by date modified"); } else { - event.currentTarget.dataset.sortmode = "path"; - event.currentTarget.dataset.sortkey = "sortPath-" + sort_dir + "-640"; + event.currentTarget.dataset.sortmode = "default"; event.currentTarget.setAttribute("title", "Sort by path"); } + applyExtraNetworkSort(tabname + "_" + extra_networks_tabname); } diff --git a/style.css b/style.css index fe74ec41f..c2637ec89 100644 --- a/style.css +++ b/style.css @@ -1468,7 +1468,7 @@ body.resizing .resize-handle { background-color: var(--input-placeholder-color); } -.extra-network-control .extra-network-control--sort[data-sortmode="path"] .extra-network-control--sort-icon { +.extra-network-control .extra-network-control--sort[data-sortmode="default"] .extra-network-control--sort-icon { mask-image: url('data:image/svg+xml,'); }