From 0d6dd52be600d5b32ad84c9d26720d36cd96bc3e Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Mon, 5 Jun 2017 20:46:31 +0800
Subject: [PLT-6697] Added CTRL/CMD+SHIFT+K shortcut to open 'more direct
 messages' dialog (#6534)

* add keypress shortcut to open 'more direct messages' dialog

* removed duplicate e.preventDefault()

* add text description to /shortcuts output
---
 webapp/components/navbar.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webapp/components/navbar.jsx')

diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx
index 948649b45..6f8df3709 100644
--- a/webapp/components/navbar.jsx
+++ b/webapp/components/navbar.jsx
@@ -220,7 +220,7 @@ export default class Navbar extends React.Component {
     }
 
     handleQuickSwitchKeyPress(e) {
-        if (Utils.cmdOrCtrlPressed(e, true) && e.keyCode === Constants.KeyCodes.K) {
+        if (Utils.cmdOrCtrlPressed(e, true) && !e.shiftKey && e.keyCode === Constants.KeyCodes.K) {
             e.preventDefault();
             if (e.altKey) {
                 if (getMyTeams(store.getState()).length <= 1) {
-- 
cgit v1.2.3-1-g7c22

