summaryrefslogtreecommitdiffstats
path: root/webapp/components/channel_header.jsx
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-07-06 08:50:43 -0400
committerChristopher Speller <crspeller@gmail.com>2016-07-06 08:50:43 -0400
commit96ca098f4bcb9d6cf1a0465a8aeade2db9294e1d (patch)
tree9668463df4cff2d7dd463a92d8ee8906f7797243 /webapp/components/channel_header.jsx
parent6c33350f5c7e58ac45d7300c035dd58ecf6b3330 (diff)
downloadchat-96ca098f4bcb9d6cf1a0465a8aeade2db9294e1d.tar.gz
chat-96ca098f4bcb9d6cf1a0465a8aeade2db9294e1d.tar.bz2
chat-96ca098f4bcb9d6cf1a0465a8aeade2db9294e1d.zip
PLT-3473 Made shortcuts only work for CMD on OSX (#3479)
* checked for CMD key * changed method of checking
Diffstat (limited to 'webapp/components/channel_header.jsx')
-rw-r--r--webapp/components/channel_header.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index 2b9b1e1cc..cfffc70ee 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -155,7 +155,7 @@ export default class ChannelHeader extends React.Component {
}
openRecentMentions(e) {
- if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.keyCode === Constants.KeyCodes.M) {
+ if (Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.keyCode === Constants.KeyCodes.M) {
e.preventDefault();
this.searchMentions(e);
}