aboutsummaryrefslogtreecommitdiffstats
path: root/src/features/spellchecker
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-02-12 20:42:21 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-02-12 20:42:21 +0100
commit2d5a303b1cc559339c3ecc7a176e9d8bd66755ef (patch)
tree2a97c1db68a72b8e208bd177af7faad5df2c9f48 /src/features/spellchecker
parentfeat(Windows): Add option to quit Franz from Taskbar icon (diff)
parentfeat(Spell checking): Add option to automatically detect language (diff)
downloadferdium-app-2d5a303b1cc559339c3ecc7a176e9d8bd66755ef.tar.gz
ferdium-app-2d5a303b1cc559339c3ecc7a176e9d8bd66755ef.tar.zst
ferdium-app-2d5a303b1cc559339c3ecc7a176e9d8bd66755ef.zip
Merge branch 'feature/spellcheck-autodetect' into develop
Diffstat (limited to 'src/features/spellchecker')
-rw-r--r--src/features/spellchecker/index.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
index 63506103c..94883ad17 100644
--- a/src/features/spellchecker/index.js
+++ b/src/features/spellchecker/index.js
@@ -5,7 +5,7 @@ import { DEFAULT_FEATURES_CONFIG } from '../../config';
5const debug = require('debug')('Franz:feature:spellchecker'); 5const debug = require('debug')('Franz:feature:spellchecker');
6 6
7export const config = observable({ 7export const config = observable({
8 isPremiumFeature: DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature, 8 isPremium: DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature,
9}); 9});
10 10
11export default function init(stores) { 11export default function init(stores) {
@@ -14,9 +14,11 @@ export default function init(stores) {
14 autorun(() => { 14 autorun(() => {
15 const { isSpellcheckerPremiumFeature } = stores.features.features; 15 const { isSpellcheckerPremiumFeature } = stores.features.features;
16 16
17 config.isPremiumFeature = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature; 17 console.log('isSpellcheckerPremiumFeature', isSpellcheckerPremiumFeature);
18 18
19 if (!stores.user.data.isPremium && config.isPremiumFeature && stores.settings.app.enableSpellchecking) { 19 config.isPremium = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
20
21 if (!stores.user.data.isPremium && config.isPremium && stores.settings.app.enableSpellchecking) {
20 debug('Override settings.spellcheckerEnabled flag to false'); 22 debug('Override settings.spellcheckerEnabled flag to false');
21 23
22 Object.assign(stores.settings.app, { 24 Object.assign(stores.settings.app, {