From 56f6da6b7c38dcd30e982e0007db919d8c1ba048 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 20:49:44 +0100 Subject: Remove unnecessary code --- src/stores/AppStore.js | 25 ------------------------- src/stores/SettingsStore.js | 3 --- 2 files changed, 28 deletions(-) (limited to 'src') diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 45335c488..6f156a96d 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js @@ -326,31 +326,6 @@ export default class AppStore extends Store { defaultLocale, fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale, }); - - // if (locales[locale] === undefined) { - // let localeFuzzy; - // Object.keys(locales).forEach((localStr) => { - // if (locales && Object.hasOwnProperty.call(locales, localStr)) { - // if (locale.substring(0, 2) === localStr.substring(0, 2)) { - // localeFuzzy = localStr; - // } - // } - // }); - - // if (localeFuzzy !== undefined) { - // locale = localeFuzzy; - // } - // } - - // if (locales[locale] === undefined) { - // locale = defaultLocale; - // } - - // if (!locale) { - // locale = DEFAULT_APP_SETTINGS.fallbackLocale; - // } - - // return locale; } _muteAppHandler() { diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 4a42ed924..f91ad5a12 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -180,9 +180,6 @@ export default class SettingsStore extends Store { }, }); - localStorage.removeItem('app'); - - debug('Set up dark mode'); } } -- cgit v1.2.3-70-g09d2 From 4996cccc05f588695698083fcbd020651251c7d1 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 20:56:12 +0100 Subject: Do a complete app reload after service update This will immediately update the module that is running in Franz as well. --- src/containers/layout/AppLayoutContainer.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index ce7f89c42..e1423bdaa 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js @@ -43,7 +43,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e handleIPCMessage, setWebviewReference, openWindow, - reloadUpdatedServices, reorder, reload, toggleNotifications, @@ -122,7 +121,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e services={servicesContainer} news={news.latest} removeNewsItem={hide} - reloadServicesAfterUpdate={reloadUpdatedServices} + reloadServicesAfterUpdate={() => window.location.reload()} installAppUpdate={installUpdate} globalError={globalError.error} showRequiredRequestsError={requests.showRequiredRequestsError} -- cgit v1.2.3-70-g09d2 From e15eeff3e99aa98289d98ae9f0debedb23020233 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 20:56:19 +0100 Subject: fix linting issues --- src/stores/SettingsStore.js | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index f91ad5a12..9ea14a911 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -179,7 +179,6 @@ export default class SettingsStore extends Store { '5.0.0-beta.19-settings': true, }, }); - } } -- cgit v1.2.3-70-g09d2 From 3d235897a61b684c6147331342a235df151a980b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 1 Dec 2018 21:08:14 +0100 Subject: split features into features and anonymousFeatures --- src/stores/FeaturesStore.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index 9480e27ab..10c893d3f 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js @@ -22,12 +22,16 @@ export default class FeaturesStore extends Store { setTimeout(this._enableFeatures.bind(this), 1); } + @computed get anonymousFeatures() { + return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG; + } + @computed get features() { if (this.stores.user.isLoggedIn) { return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG; } - return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG; + return DEFAULT_FEATURES_CONFIG; } _monitorLoginStatus() { -- cgit v1.2.3-70-g09d2