corbz/PYRSS-Website
corbz/PYRSS-Website
1
0
Fork 0
Code Issues 21 Pull Requests Actions Releases 1 Wiki Activity

fix label bug & make items focusable
Some checks failed
Build and Push Docker Image / build (push) Failing after 6m59s
Details

Browse Source
This commit is contained in:
Corban-Lee Jones 2024-10-27 11:00:03 +00:00
parent 10ae9aa4d9
commit 3379891bd7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
static/js/base.js
View File

@ -124,13 +124,11 @@ $(document).ready(function() {
} }
}); });
console.log(JSON.stringify(names)) const len = Array.isArray(values) ? values.length : 1;
const len = values.length;
const total = $select.find("option").length; const total = $select.find("option").length;
if (len === 0) { $selected.html(defaultSelectedHtml); } if (len === 0) { $selected.html(defaultSelectedHtml); }
else if (len === total) {$selected.text("All Selected")} else if (len === total && total > 3) {$selected.text("All Selected")}
else if (len > 3) { $selected.text(`${values.length} Selected`); } else if (len > 3) { $selected.text(`${values.length} Selected`); }
else { $selected.text(names.join(", ")); } else { $selected.text(names.join(", ")); }
@ -154,7 +152,7 @@ $(document).ready(function() {
const $select = $(this); const $select = $(this);
// The custom input to replace the original select // The custom input to replace the original select
const $container = $('<div class="corbz-select-container">'); const $container = $('<div class="corbz-select-container" tabindex="0">');
// Contains text indicating the 'selected' options, acts as a // Contains text indicating the 'selected' options, acts as a
// button to open the dropdown. // button to open the dropdown.
@ -217,19 +215,21 @@ $(document).ready(function() {
updateSelectedDisplay($select, $selected, $dropdown, settings) updateSelectedDisplay($select, $selected, $dropdown, settings)
} }
const onOptionSelect = $option => {
$dropdown.hide();
$container.removeClass("active");
$select.val($option.data("value"));
updateSelectedDisplayWrapper();
}
$select.find("option").each(function() { $select.find("option").each(function() {
const $option = $('<div class="corbz-select-option">'); const $option = $('<div class="corbz-select-option" tabindex="0">');
$option.data("name", $(this).text()); $option.data("name", $(this).text());
$option.data("value", $(this).val()); $option.data("value", $(this).val());
if (!settings.multiple) { if (!settings.multiple) {
$option.text($(this).text()); $option.text($(this).text());
$option.on("click", function() { $option.on("click", () => onOptionSelect($option));
$dropdown.hide();
$container.removeClass("active");
$select.val($option.data("value"));
updateSelectedDisplayWrapper();
});
} }
else { else {
const $checkbox = $(`<input type="checkbox" name="${settings.id}" class="corbz-option-checkbox" value="${$(this).val()}">`).val($(this).val()); const $checkbox = $(`<input type="checkbox" name="${settings.id}" class="corbz-option-checkbox" value="${$(this).val()}">`).val($(this).val());