diff options
| author | David Lu <david.lu@hotmail.com> | 2016-05-16 06:45:54 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-16 06:45:54 -0400 |
| commit | 6363fc5b7f875d3a214f738e883fa0916d45a845 (patch) | |
| tree | 786cd420dd25a9b9d1051f1db6e3002b38ed9573 /webapp | |
| parent | 5631a949acf30c33639f29627ad24c7b783b7260 (diff) | |
| download | chat-6363fc5b7f875d3a214f738e883fa0916d45a845.tar.gz chat-6363fc5b7f875d3a214f738e883fa0916d45a845.tar.bz2 chat-6363fc5b7f875d3a214f738e883fa0916d45a845.zip | |
Added preventDefault to suppress browser-specific shortcuts (#2995)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/channel_header.jsx | 1 | ||||
| -rw-r--r-- | webapp/components/navbar_dropdown.jsx | 1 |
2 files changed, 2 insertions, 0 deletions
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}); } } |