aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/containers/layout/AppLayoutContainer.js3
-rw-r--r--src/stores/AppStore.js25
-rw-r--r--src/stores/FeaturesStore.js6
-rw-r--r--src/stores/SettingsStore.js4
4 files changed, 6 insertions, 32 deletions
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
43 handleIPCMessage, 43 handleIPCMessage,
44 setWebviewReference, 44 setWebviewReference,
45 openWindow, 45 openWindow,
46 reloadUpdatedServices,
47 reorder, 46 reorder,
48 reload, 47 reload,
49 toggleNotifications, 48 toggleNotifications,
@@ -122,7 +121,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
122 services={servicesContainer} 121 services={servicesContainer}
123 news={news.latest} 122 news={news.latest}
124 removeNewsItem={hide} 123 removeNewsItem={hide}
125 reloadServicesAfterUpdate={reloadUpdatedServices} 124 reloadServicesAfterUpdate={() => window.location.reload()}
126 installAppUpdate={installUpdate} 125 installAppUpdate={installUpdate}
127 globalError={globalError.error} 126 globalError={globalError.error}
128 showRequiredRequestsError={requests.showRequiredRequestsError} 127 showRequiredRequestsError={requests.showRequiredRequestsError}
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 {
326 defaultLocale, 326 defaultLocale,
327 fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale, 327 fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale,
328 }); 328 });
329
330 // if (locales[locale] === undefined) {
331 // let localeFuzzy;
332 // Object.keys(locales).forEach((localStr) => {
333 // if (locales && Object.hasOwnProperty.call(locales, localStr)) {
334 // if (locale.substring(0, 2) === localStr.substring(0, 2)) {
335 // localeFuzzy = localStr;
336 // }
337 // }
338 // });
339
340 // if (localeFuzzy !== undefined) {
341 // locale = localeFuzzy;
342 // }
343 // }
344
345 // if (locales[locale] === undefined) {
346 // locale = defaultLocale;
347 // }
348
349 // if (!locale) {
350 // locale = DEFAULT_APP_SETTINGS.fallbackLocale;
351 // }
352
353 // return locale;
354 } 329 }
355 330
356 _muteAppHandler() { 331 _muteAppHandler() {
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 {
22 setTimeout(this._enableFeatures.bind(this), 1); 22 setTimeout(this._enableFeatures.bind(this), 1);
23 } 23 }
24 24
25 @computed get anonymousFeatures() {
26 return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
27 }
28
25 @computed get features() { 29 @computed get features() {
26 if (this.stores.user.isLoggedIn) { 30 if (this.stores.user.isLoggedIn) {
27 return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG; 31 return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG;
28 } 32 }
29 33
30 return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG; 34 return DEFAULT_FEATURES_CONFIG;
31 } 35 }
32 36
33 _monitorLoginStatus() { 37 _monitorLoginStatus() {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 4a42ed924..9ea14a911 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -179,10 +179,6 @@ export default class SettingsStore extends Store {
179 '5.0.0-beta.19-settings': true, 179 '5.0.0-beta.19-settings': true,
180 }, 180 },
181 }); 181 });
182
183 localStorage.removeItem('app');
184
185 debug('Set up dark mode');
186 } 182 }
187 } 183 }
188 184