From a479fd958dca56dfe669b872713289db40383cb2 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 29 Apr 2021 08:52:22 +0200 Subject: Fix spellcheckerLanguage array/string confusion (#1314) --- src/containers/settings/EditSettingsScreen.js | 2 +- src/webview/recipe.js | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 0a82fff84..94c53fc90 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -267,7 +267,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted, showDragArea: settingsData.showDragArea, enableSpellchecking: settingsData.enableSpellchecking, - spellcheckerLanguage: JSON.stringify(settingsData.spellcheckerLanguage), + spellcheckerLanguage: settingsData.spellcheckerLanguage, beta: settingsData.beta, // we need this info in the main process as well automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well locale: settingsData.locale, // we need this info in the main process as well diff --git a/src/webview/recipe.js b/src/webview/recipe.js index d29f3edbd..2319e8e2a 100644 --- a/src/webview/recipe.js +++ b/src/webview/recipe.js @@ -128,17 +128,7 @@ class RecipeController { } @computed get spellcheckerLanguage() { - let selected; - const langs = this.settings.service.spellcheckerLanguage || this.settings.app.spellcheckerLanguage; - if (typeof langs === 'string' && langs.substr(0, 1) === '[') { - // Value is JSON encoded - selected = JSON.parse(langs); - } else if (typeof langs === 'object') { - selected = langs; - } else { - selected = [langs]; - } - + const selected = this.settings.service.spellcheckerLanguage || this.settings.app.spellcheckerLanguage; return selected; } -- cgit v1.2.3-70-g09d2