diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-22 10:42:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 10:42:37 +0100 |
commit | 5069ca00fa82ebb899bafbff2081cd191325fd07 (patch) | |
tree | e246632851bf7d5ae06d34c92b33a8aad6b22a91 /src/stores/AppStore.js | |
parent | fix merging issue (diff) | |
parent | test tweetdeck glitches (diff) | |
download | ferdium-app-5069ca00fa82ebb899bafbff2081cd191325fd07.tar.gz ferdium-app-5069ca00fa82ebb899bafbff2081cd191325fd07.tar.zst ferdium-app-5069ca00fa82ebb899bafbff2081cd191325fd07.zip |
Merge pull request #324 from meetfranz/feature/beta-14-bugfixing
Beta 14 bugfixing
Diffstat (limited to 'src/stores/AppStore.js')
-rw-r--r-- | src/stores/AppStore.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 14bdab094..3eb2c38d2 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -127,16 +127,22 @@ export default class AppStore extends Store { | |||
127 | 127 | ||
128 | // Set active the next service | 128 | // Set active the next service |
129 | key( | 129 | key( |
130 | '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => { | 130 | '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => { |
131 | this.actions.service.setActiveNext(); | 131 | this.actions.service.setActiveNext(); |
132 | }); | 132 | }); |
133 | 133 | ||
134 | // Set active the prev service | 134 | // Set active the prev service |
135 | key( | 135 | key( |
136 | '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => { | 136 | '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => { |
137 | this.actions.service.setActivePrev(); | 137 | this.actions.service.setActivePrev(); |
138 | }); | 138 | }); |
139 | 139 | ||
140 | // Global Mute | ||
141 | key( | ||
142 | '⌘+shift+m ctrl+shift+m', () => { | ||
143 | this.actions.app.toggleMuteApp(); | ||
144 | }); | ||
145 | |||
140 | this.locale = this._getDefaultLocale(); | 146 | this.locale = this._getDefaultLocale(); |
141 | 147 | ||
142 | this._healthCheck(); | 148 | this._healthCheck(); |