From eed0aa9d9e750a5849a8846293cee26f07b08061 Mon Sep 17 00:00:00 2001 From: redphx <96280+redphx@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:17:17 +0700 Subject: [PATCH] Fix not disabling unsupported features in Settings dialog --- dist/better-xcloud.user.js | 4 ++-- src/modules/ui/dialog/settings-dialog.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/better-xcloud.user.js b/dist/better-xcloud.user.js index a1844d4..f3e743a 100644 --- a/dist/better-xcloud.user.js +++ b/dist/better-xcloud.user.js @@ -5045,11 +5045,11 @@ class SettingsNavigationDialog extends NavigationDialog { _nearby: { orientation: "horizontal" } - }, $label = CE("span", { class: "bx-settings-label" }, label, note && CE("div", { class: "bx-settings-dialog-note" }, note), setting.unsupported && CE("div", { class: "bx-settings-dialog-note" }, t("browser-unsupported-feature"))), !setting.unsupported && $control), $link = $label.querySelector("a"); + }, $label = CE("span", { class: "bx-settings-label" }, label, note ? CE("div", { class: "bx-settings-dialog-note" }, note) : prefDefinition?.unsupported && CE("div", { class: "bx-settings-dialog-note" }, t("browser-unsupported-feature"))), !prefDefinition?.unsupported && $control), $link = $label.querySelector("a"); if ($link) $link.classList.add("bx-focusable"), setNearby($label, { focus: $link }); - $tabContent.appendChild($row), setting.onCreated && setting.onCreated(setting, $control); + $tabContent.appendChild($row), !prefDefinition?.unsupported && setting.onCreated && setting.onCreated(setting, $control); } setupDialog() { let $tabs, $settings; diff --git a/src/modules/ui/dialog/settings-dialog.ts b/src/modules/ui/dialog/settings-dialog.ts index f62b340..d118793 100644 --- a/src/modules/ui/dialog/settings-dialog.ts +++ b/src/modules/ui/dialog/settings-dialog.ts @@ -1152,6 +1152,7 @@ export class SettingsNavigationDialog extends NavigationDialog { } let $label; + const $row = CE('label', { class: 'bx-settings-row', for: `bx_setting_${pref}`, @@ -1162,10 +1163,9 @@ export class SettingsNavigationDialog extends NavigationDialog { }, $label = CE('span', {class: 'bx-settings-label'}, label, - note && CE('div', {class: 'bx-settings-dialog-note'}, note), - setting.unsupported && CE('div', {class: 'bx-settings-dialog-note'}, t('browser-unsupported-feature')), + note ? CE('div', {class: 'bx-settings-dialog-note'}, note) : prefDefinition?.unsupported && CE('div', {class: 'bx-settings-dialog-note'}, t('browser-unsupported-feature')), ), - !setting.unsupported && $control, + !prefDefinition?.unsupported && $control, ); // Make link inside