Merge branch 'develop' into fix-theme-change

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';
 import { gaEvent } from '../lib/analytics';
 import Miner from '../lib/Miner';
 
-const { app, getCurrentWindow, powerMonitor } = remote;
+const { app, powerMonitor } = remote;
 const defaultLocale = 'en-US';
 
 export default class AppStore extends Store {
@@ -112,24 +112,15 @@ export default class AppStore extends Store {
       setTimeout(window.location.reload, 5000);
     });
 
-    // Open Dev Tools (even in production mode)
-    key('⌘+ctrl+shift+alt+i, ctrl+shift+alt+i', () => {
-      getCurrentWindow().toggleDevTools();
-    });
-
-    key('⌘+ctrl+shift+alt+pageup, ctrl+shift+alt+pageup', () => {
-      this.actions.service.openDevToolsForActiveService();
-    });
-
     // Set active the next service
     key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => {
+      '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => {
         this.actions.service.setActiveNext();
       });
 
     // Set active the prev service
     key(
-      '⌘+pageup, ctrl+pageup, ⌘+tab, ctrl+tab', () => {
+      '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => {
         this.actions.service.setActivePrev();
       });
 
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 4510146e0..64e6bb42b 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -41,6 +41,7 @@ export default class ServicesStore extends Store {
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
     this.actions.service.resetFilter.listen(this._resetFilter.bind(this));
+    this.actions.service.resetStatus.listen(this._resetStatus.bind(this));
     this.actions.service.reload.listen(this._reload.bind(this));
     this.actions.service.reloadActive.listen(this._reloadActive.bind(this));
     this.actions.service.reloadAll.listen(this._reloadAll.bind(this));
@@ -338,6 +339,10 @@ export default class ServicesStore extends Store {
     this.filterNeedle = null;
   }
 
+  @action _resetStatus() {
+    this.actionStatus = [];
+  }
+
   @action _reload({ serviceId }) {
     const service = this.one(serviceId);
     service.resetMessageCount();