diff options
author | 2017-10-30 10:47:50 +0100 | |
---|---|---|
committer | 2017-10-30 10:47:50 +0100 | |
commit | 138feede365a074dff4da238ea1313e89bfb1c5d (patch) | |
tree | 90f929642daa7969a0bdac7f41172fbb086a3f4f /src/stores | |
parent | Add onNotify event to let recipes update/change notifications before send them. (diff) | |
parent | Merge pull request #155 from dannyqiu/fix-theme-change (diff) | |
download | ferdium-app-138feede365a074dff4da238ea1313e89bfb1c5d.tar.gz ferdium-app-138feede365a074dff4da238ea1313e89bfb1c5d.tar.zst ferdium-app-138feede365a074dff4da238ea1313e89bfb1c5d.zip |
Merge branch 'develop' into notificationTitleFix
Diffstat (limited to 'src/stores')
-rw-r--r-- | src/stores/AppStore.js | 15 | ||||
-rw-r--r-- | src/stores/ServicesStore.js | 5 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index 7dbef985d..f608a689e 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js | |||
@@ -13,7 +13,7 @@ import locales from '../i18n/translations'; | |||
13 | import { gaEvent } from '../lib/analytics'; | 13 | import { gaEvent } from '../lib/analytics'; |
14 | import Miner from '../lib/Miner'; | 14 | import Miner from '../lib/Miner'; |
15 | 15 | ||
16 | const { app, getCurrentWindow, powerMonitor } = remote; | 16 | const { app, powerMonitor } = remote; |
17 | const defaultLocale = 'en-US'; | 17 | const defaultLocale = 'en-US'; |
18 | 18 | ||
19 | export default class AppStore extends Store { | 19 | export default class AppStore extends Store { |
@@ -112,24 +112,15 @@ export default class AppStore extends Store { | |||
112 | setTimeout(window.location.reload, 5000); | 112 | setTimeout(window.location.reload, 5000); |
113 | }); | 113 | }); |
114 | 114 | ||
115 | // Open Dev Tools (even in production mode) | ||
116 | key('⌘+ctrl+shift+alt+i, ctrl+shift+alt+i', () => { | ||
117 | getCurrentWindow().toggleDevTools(); | ||
118 | }); | ||
119 | |||
120 | key('⌘+ctrl+shift+alt+pageup, ctrl+shift+alt+pageup', () => { | ||
121 | this.actions.service.openDevToolsForActiveService(); | ||
122 | }); | ||
123 | |||
124 | // Set active the next service | 115 | // Set active the next service |
125 | key( | 116 | key( |
126 | '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => { | 117 | '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => { |
127 | this.actions.service.setActiveNext(); | 118 | this.actions.service.setActiveNext(); |
128 | }); | 119 | }); |
129 | 120 | ||
130 | // Set active the prev service | 121 | // Set active the prev service |
131 | key( | 122 | key( |
132 | '⌘+pageup, ctrl+pageup, ⌘+tab, ctrl+tab', () => { | 123 | '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => { |
133 | this.actions.service.setActivePrev(); | 124 | this.actions.service.setActivePrev(); |
134 | }); | 125 | }); |
135 | 126 | ||
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 7e797ce55..2ddeeffd4 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -41,6 +41,7 @@ export default class ServicesStore extends Store { | |||
41 | this.actions.service.openWindow.listen(this._openWindow.bind(this)); | 41 | this.actions.service.openWindow.listen(this._openWindow.bind(this)); |
42 | this.actions.service.filter.listen(this._filter.bind(this)); | 42 | this.actions.service.filter.listen(this._filter.bind(this)); |
43 | this.actions.service.resetFilter.listen(this._resetFilter.bind(this)); | 43 | this.actions.service.resetFilter.listen(this._resetFilter.bind(this)); |
44 | this.actions.service.resetStatus.listen(this._resetStatus.bind(this)); | ||
44 | this.actions.service.reload.listen(this._reload.bind(this)); | 45 | this.actions.service.reload.listen(this._reload.bind(this)); |
45 | this.actions.service.reloadActive.listen(this._reloadActive.bind(this)); | 46 | this.actions.service.reloadActive.listen(this._reloadActive.bind(this)); |
46 | this.actions.service.reloadAll.listen(this._reloadAll.bind(this)); | 47 | this.actions.service.reloadAll.listen(this._reloadAll.bind(this)); |
@@ -341,6 +342,10 @@ export default class ServicesStore extends Store { | |||
341 | this.filterNeedle = null; | 342 | this.filterNeedle = null; |
342 | } | 343 | } |
343 | 344 | ||
345 | @action _resetStatus() { | ||
346 | this.actionStatus = []; | ||
347 | } | ||
348 | |||
344 | @action _reload({ serviceId }) { | 349 | @action _reload({ serviceId }) { |
345 | const service = this.one(serviceId); | 350 | const service = this.one(serviceId); |
346 | service.resetMessageCount(); | 351 | service.resetMessageCount(); |