diff --git a/frontend/src/js/config.js b/frontend/src/js/config.js index 6e8f1dd30..087b75af7 100644 --- a/frontend/src/js/config.js +++ b/frontend/src/js/config.js @@ -1455,6 +1455,8 @@ export function apply(configObj) { $("#ad_about1").remove(); $("#ad_about2").remove(); } + + ConfigEvent.dispatch("configApplied", config); } } diff --git a/frontend/src/js/pages/settings.js b/frontend/src/js/pages/settings.js index 031f432be..0ade90d00 100644 --- a/frontend/src/js/pages/settings.js +++ b/frontend/src/js/pages/settings.js @@ -12,6 +12,7 @@ import * as PresetController from "../controllers/preset-controller"; import * as ThemePicker from "../settings/theme-picker"; import * as ImportExportSettingsPopup from "../popups/import-export-settings-popup"; import * as CustomThemePopup from "../popups/custom-theme-popup"; +import * as ConfigEvent from "./../observables/config-event"; import Page from "./page"; export let groups = {}; @@ -915,6 +916,12 @@ $(".quickNav .links a").on("click", (e) => { isOpen && toggleSettingsGroup(settingsGroup); }); +$(document).ready(() => { + ConfigEvent.subscribe((eventKey) => { + if (eventKey === "configApplied") update(); + }); +}); + export const page = new Page( "settings", $(".page.pageSettings"), diff --git a/frontend/src/js/popups/import-export-settings-popup.js b/frontend/src/js/popups/import-export-settings-popup.js index 6b237c755..e91c17365 100644 --- a/frontend/src/js/popups/import-export-settings-popup.js +++ b/frontend/src/js/popups/import-export-settings-popup.js @@ -1,5 +1,4 @@ import * as UpdateConfig from "../config"; -import * as Settings from "../pages/settings"; import * as Notifications from "../elements/notifications"; export function show(mode, config) { @@ -37,7 +36,6 @@ function hide() { ); } UpdateConfig.saveToLocalStorage(); - Settings.update(); } $("#settingsImportWrapper") .stop(true, true)