Merge pull request #4284 from blazoncek/search-keep

Keep selected FX visible while searching
This commit is contained in:
netmindz 2024-11-26 09:10:14 +00:00 committed by GitHub
commit 0b54034470
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2850,8 +2850,12 @@ function search(field, listId = null) {
if (listId !== 'pcont' && i === 0) return; if (listId !== 'pcont' && i === 0) return;
const listItemName = listItem.querySelector('.lstIname').innerText.toUpperCase(); const listItemName = listItem.querySelector('.lstIname').innerText.toUpperCase();
const searchIndex = listItemName.indexOf(field.value.toUpperCase()); const searchIndex = listItemName.indexOf(field.value.toUpperCase());
listItem.style.display = (searchIndex < 0) ? 'none' : ''; if (searchIndex < 0) {
listItem.dataset.searchIndex = Number.MAX_SAFE_INTEGER;
} else {
listItem.dataset.searchIndex = searchIndex; listItem.dataset.searchIndex = searchIndex;
}
listItem.style.display = (searchIndex < 0) && !listItem.classList.contains("selected") ? 'none' : '';
}); });
// sort list items by search index and name // sort list items by search index and name
@ -2924,7 +2928,7 @@ function filterFx() {
const listItemName = listItem.querySelector('.lstIname').innerText; const listItemName = listItem.querySelector('.lstIname').innerText;
let hide = false; let hide = false;
gId("filters").querySelectorAll("input[type=checkbox]").forEach((e) => { if (e.checked && !listItemName.includes(e.dataset.flt)) hide = i > 0 /*true*/; }); gId("filters").querySelectorAll("input[type=checkbox]").forEach((e) => { if (e.checked && !listItemName.includes(e.dataset.flt)) hide = i > 0 /*true*/; });
listItem.style.display = hide ? 'none' : ''; listItem.style.display = hide && !listItem.classList.contains("selected") ? 'none' : '';
}); });
} }