diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js index 9f686ded..75144ca6 100644 --- a/client/src/modules/csseditor.js +++ b/client/src/modules/csseditor.js @@ -41,7 +41,7 @@ export default class { /** * Update css in client * @param {String} scss scss to compile - * @param {bool} sendSource send to css editor instance + * @param {bool} sendSource send to css editor instance */ static updateScss(scss, sendSource) { if (sendSource) @@ -86,7 +86,7 @@ export default class { /** * Send css to open editor - * @param {any} channel + * @param {any} channel * @param {any} data */ static async sendToEditor(channel, data) { @@ -94,14 +94,14 @@ export default class { } /** - * Current uncompiled scss + * Current uncompiled scss */ static get scss() { return this._scss || ''; } /** - * Set current scss + * Set current scss */ static set scss(scss) { this.updateScss(scss, true); diff --git a/client/src/modules/settings.js b/client/src/modules/settings.js index 12d84adc..ff07f7ac 100644 --- a/client/src/modules/settings.js +++ b/client/src/modules/settings.js @@ -113,7 +113,7 @@ export default class { return setting ? setting.value : undefined; } - static saveSettings(set_id, newSettings, settingsUpdated) { + static mergeSettings(set_id, newSettings, settingsUpdated) { const set = this.getSet(set_id); if (!set) return; const updatedSettings = []; @@ -132,6 +132,7 @@ export default class { } } + this.saveSettings(); return settingsUpdated ? settingsUpdated(updatedSettings) : updatedSettings; } diff --git a/client/src/ui/modals.js b/client/src/ui/modals.js index e4e869c1..4cd0e467 100644 --- a/client/src/ui/modals.js +++ b/client/src/ui/modals.js @@ -105,7 +105,7 @@ export default class { static internalSettings(set_id) { const set = Settings.getSet(set_id); if (!set) return; - return this.settings(set.headertext, set.settings, null, null, newSettings => Settings.saveSettings(set.id, newSettings)); + return this.settings(set.headertext, set.settings, null, null, newSettings => Settings.mergeSettings(set.id, newSettings)); } static contentSettings(content) {