Assclaw/jfa-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: fix search with disabled/deprecated sections/settings

Browse Source 
it was assumed all sections and settings would exist (either in
this._sections or on the DOM with the "data-name" attribute). Now it
checks they do and just ignores them if not.
This commit is contained in:
Harvey Tindall
2025-05-14 22:11:24 +01:00
parent b47a481678
commit e38ac62ae4
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ts/modules/settings.ts
+12 -4
View File
@@ -639,7 +639,7 @@ export class settingsList {
} }
private _showPanel = (name: string) => { private _showPanel = (name: string) => {
console.log("showing", name); // console.log("showing", name);
for (let n in this._sections) { for (let n in this._sections) {
if (n == name) { if (n == name) {
this._sections[name].visible = true; this._sections[name].visible = true;
@@ -944,8 +944,13 @@ export class settingsList {
let firstVisibleSection = ""; let firstVisibleSection = "";
for (let section of this._settings.sections) { for (let section of this._settings.sections) {
// Section might be disabled at build-time (like Updates), or deprecated and so not appear.
let dependencyCard = this._sections[section.section].asElement().querySelector(".settings-dependency-message"); if (!(section.section in this._sections)) {
// console.log(`Couldn't find section "${section.section}"`);
continue
}
const sectionElement = this._sections[section.section].asElement();
let dependencyCard = sectionElement.querySelector(".settings-dependency-message");
if (dependencyCard) dependencyCard.remove(); if (dependencyCard) dependencyCard.remove();
dependencyCard = null; dependencyCard = null;
let dependencyList = null; let dependencyList = null;
@@ -964,10 +969,13 @@ export class settingsList {
matchedSection = true; matchedSection = true;
} }
} }
const sectionElement = this._sections[section.section].asElement();
for (let setting of section.settings) { for (let setting of section.settings) {
if (setting.type == "note") continue; if (setting.type == "note") continue;
const element = sectionElement.querySelector(`div[data-name="${setting.setting}"]`) as HTMLElement; const element = sectionElement.querySelector(`div[data-name="${setting.setting}"]`) as HTMLElement;
// Again, setting might be disabled at build-time (if we have such a mechanism) or deprecated (like the old duplicate 'url_base's)
if (element == null) {
continue;
}
// If we match the whole section, don't bother searching settings. // If we match the whole section, don't bother searching settings.
if (matchedSection) { if (matchedSection) {