From 6363fc5b7f875d3a214f738e883fa0916d45a845 Mon Sep 17 00:00:00 2001
From: David Lu <david.lu@hotmail.com>
Date: Mon, 16 May 2016 06:45:54 -0400
Subject: Added preventDefault to suppress browser-specific shortcuts (#2995)

---
 webapp/components/channel_header.jsx  | 1 +
 webapp/components/navbar_dropdown.jsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index 922f8b21c..91060f583 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -144,6 +144,7 @@ export default class ChannelHeader extends React.Component {
     }
     openRecentMentions(e) {
         if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.keyCode === Constants.KeyCodes.M) {
+            e.preventDefault();
             this.searchMentions(e);
         }
     }
diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx
index 162841f32..68ea625f8 100644
--- a/webapp/components/navbar_dropdown.jsx
+++ b/webapp/components/navbar_dropdown.jsx
@@ -71,6 +71,7 @@ export default class NavbarDropdown extends React.Component {
     }
     openAccountSettings(e) {
         if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.keyCode === Constants.KeyCodes.A) {
+            e.preventDefault();
             this.setState({showUserSettingsModal: true});
         }
     }
-- 
cgit v1.2.3-1-g7c22