diff options
author | vantezzen <properly@protonmail.com> | 2019-09-13 17:59:46 +0200 |
---|---|---|
committer | vantezzen <properly@protonmail.com> | 2019-09-13 17:59:46 +0200 |
commit | fb095e4984210ec63c5834d6762dec43457dbc57 (patch) | |
tree | a2c8b353313cb363a56722687e110c6f80f4b791 /src/stores/ServicesStore.js | |
parent | Use ferdi namespace on debugger (diff) | |
parent | Update CHANGELOG.md (diff) | |
download | ferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.tar.gz ferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.tar.zst ferdium-app-fb095e4984210ec63c5834d6762dec43457dbc57.zip |
Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master
Diffstat (limited to 'src/stores/ServicesStore.js')
-rw-r--r-- | src/stores/ServicesStore.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index c02f08201..374daf333 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -121,9 +121,10 @@ export default class ServicesStore extends Store { | |||
121 | // This is just used to avoid unnecessary rerendering of resource-heavy webviews | 121 | // This is just used to avoid unnecessary rerendering of resource-heavy webviews |
122 | @computed get allDisplayedUnordered() { | 122 | @computed get allDisplayedUnordered() { |
123 | const { showDisabledServices } = this.stores.settings.all.app; | 123 | const { showDisabledServices } = this.stores.settings.all.app; |
124 | const { keepAllWorkspacesLoaded } = this.stores.workspaces.settings; | ||
124 | const services = this.allServicesRequest.execute().result || []; | 125 | const services = this.allServicesRequest.execute().result || []; |
125 | const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled); | 126 | const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled); |
126 | return workspaceStore.filterServicesByActiveWorkspace(filteredServices); | 127 | return keepAllWorkspacesLoaded ? filteredServices : workspaceStore.filterServicesByActiveWorkspace(filteredServices); |
127 | } | 128 | } |
128 | 129 | ||
129 | @computed get filtered() { | 130 | @computed get filtered() { |