diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-12-04 09:48:10 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-04 09:48:10 +0100 |
| commit | 5a4a7f295cef1258e3d53afdbb6752d47964a949 (patch) | |
| tree | e776421a8c0f14f75cbfeddf0972bb5488e73649 /src | |
| parent | Merge pull request #393 from meetfranz/feature/370-notification-click (diff) | |
| parent | Fix linting error (diff) | |
| download | ferdium-app-5a4a7f295cef1258e3d53afdbb6752d47964a949.tar.gz ferdium-app-5a4a7f295cef1258e3d53afdbb6752d47964a949.tar.zst ferdium-app-5a4a7f295cef1258e3d53afdbb6752d47964a949.zip | |
fix(Shortcuts): Fix service shortcuts for disabled but shown services (@josescgar)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Menu.js | 2 | ||||
| -rw-r--r-- | src/stores/AppStore.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 6624ab75e..d9c30466b 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
| @@ -249,7 +249,7 @@ export default class FranzMenu { | |||
| 249 | } | 249 | } |
| 250 | 250 | ||
| 251 | @computed get serviceTpl() { | 251 | @computed get serviceTpl() { |
| 252 | const services = this.stores.services.enabled; | 252 | const services = this.stores.services.allDisplayed; |
| 253 | 253 | ||
| 254 | if (this.stores.user.isLoggedIn) { | 254 | if (this.stores.user.isLoggedIn) { |
| 255 | return services.map((service, i) => ({ | 255 | return services.map((service, i) => ({ |
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 8c55a350d..17ec832cf 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
| @@ -138,7 +138,7 @@ export default class AppStore extends Store { | |||
| 138 | this.actions.service.setActivePrev(); | 138 | this.actions.service.setActivePrev(); |
| 139 | }); | 139 | }); |
| 140 | 140 | ||
| 141 | // Global Mute | 141 | // Global Mute |
| 142 | key( | 142 | key( |
| 143 | '⌘+shift+m ctrl+shift+m', () => { | 143 | '⌘+shift+m ctrl+shift+m', () => { |
| 144 | this.actions.app.toggleMuteApp(); | 144 | this.actions.app.toggleMuteApp(); |