diff options
author | 2017-11-09 12:11:16 +0100 | |
---|---|---|
committer | 2017-11-09 12:15:36 +0100 | |
commit | 1839eff4fcad186871672499b6c3cc68e9539ce2 (patch) | |
tree | 207f0c0cf694309f6d84afeee220cacdc9b56242 /src/stores/SettingsStore.js | |
parent | Merge branch 'develop' of github.com:meetfranz/franz into develop (diff) | |
download | ferdium-app-1839eff4fcad186871672499b6c3cc68e9539ce2.tar.gz ferdium-app-1839eff4fcad186871672499b6c3cc68e9539ce2.tar.zst ferdium-app-1839eff4fcad186871672499b6c3cc68e9539ce2.zip |
feat(Service): Add option to display disabled services in tabs
Diffstat (limited to 'src/stores/SettingsStore.js')
-rw-r--r-- | src/stores/SettingsStore.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 816f545ee..331df5c15 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
@@ -5,6 +5,7 @@ import Store from './lib/Store'; | |||
5 | import Request from './lib/Request'; | 5 | import Request from './lib/Request'; |
6 | import CachedRequest from './lib/CachedRequest'; | 6 | import CachedRequest from './lib/CachedRequest'; |
7 | import { gaEvent } from '../lib/analytics'; | 7 | import { gaEvent } from '../lib/analytics'; |
8 | import { DEFAULT_APP_SETTINGS } from '../config'; | ||
8 | 9 | ||
9 | export default class SettingsStore extends Store { | 10 | export default class SettingsStore extends Store { |
10 | @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings'); | 11 | @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings'); |
@@ -29,7 +30,7 @@ export default class SettingsStore extends Store { | |||
29 | } | 30 | } |
30 | 31 | ||
31 | @computed get all() { | 32 | @computed get all() { |
32 | return this.allSettingsRequest.result || {}; | 33 | return observable(Object.assign(DEFAULT_APP_SETTINGS, this.allSettingsRequest.result)); |
33 | } | 34 | } |
34 | 35 | ||
35 | @action async _update({ settings }) { | 36 | @action async _update({ settings }) { |