From 6d6f9bc619638be2afa218f3662585cee38bd548 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Mon, 21 Oct 2024 00:49:22 +0300 Subject: [PATCH] Reorder code to match UI --- src/webui/www/private/views/preferences.html | 30 +++++++++----------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index 01ba710b2..6bc3567d1 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -2037,6 +2037,10 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD window.parent.qBittorrent.Cache.preferences.init({ onSuccess: (pref) => { // Behavior tab + // Language + updateWebuiLocaleSelect(pref.locale); + updateColoSchemeSelect(); + $("performanceWarning").setProperty("checked", pref.performance_warning); $("filelog_checkbox").setProperty("checked", pref.file_log_enabled); $("filelog_save_path_input").setProperty("value", pref.file_log_path); $("filelog_backup_checkbox").setProperty("checked", pref.file_log_backup_enabled); @@ -2316,11 +2320,6 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD $("rss_filter_textarea").setProperty("value", pref.rss_smart_episode_filters); // WebUI tab - // Language - updateWebuiLocaleSelect(pref.locale); - updateColoSchemeSelect(); - $("performanceWarning").setProperty("checked", pref.performance_warning); - // HTTP Server $("webui_domain_textarea").setProperty("value", pref.web_ui_domain_list); $("webui_address_value").setProperty("value", pref.web_ui_address); @@ -2449,6 +2448,16 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD // Validate form data // Behavior tab + // Language + settings["locale"] = $("locale_select").getProperty("value"); + const colorScheme = Number(document.getElementById("colorSchemeSelect").value); + if (colorScheme === 0) + LocalPreferences.remove("color_scheme"); + else if (colorScheme === 1) + LocalPreferences.set("color_scheme", "light"); + else + LocalPreferences.set("color_scheme", "dark"); + settings["performance_warning"] = $("performanceWarning").getProperty("checked"); settings["file_log_enabled"] = $("filelog_checkbox").getProperty("checked"); settings["file_log_path"] = $("filelog_save_path_input").getProperty("value"); settings["file_log_backup_enabled"] = $("filelog_backup_checkbox").getProperty("checked"); @@ -2735,17 +2744,6 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD settings["rss_smart_episode_filters"] = $("rss_filter_textarea").getProperty("value"); // WebUI tab - // Language - settings["locale"] = $("locale_select").getProperty("value"); - const colorScheme = Number(document.getElementById("colorSchemeSelect").value); - if (colorScheme === 0) - LocalPreferences.remove("color_scheme"); - else if (colorScheme === 1) - LocalPreferences.set("color_scheme", "light"); - else - LocalPreferences.set("color_scheme", "dark"); - settings["performance_warning"] = $("performanceWarning").getProperty("checked"); - // HTTP Server settings["web_ui_domain_list"] = $("webui_domain_textarea").getProperty("value"); const web_ui_address = $("webui_address_value").getProperty("value").toString();