diff options
author | David Lu <david.lu@hotmail.com> | 2016-05-16 08:07:37 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-16 08:07:37 -0400 |
commit | c5f105787c7d740eaa9fb01891711a6fb72f7480 (patch) | |
tree | b2a04a73bce954e12553884339ba6d8b66ba276f /webapp | |
parent | 0258fcfa5c8da92351371169b66ce30462a34853 (diff) | |
download | chat-c5f105787c7d740eaa9fb01891711a6fb72f7480.tar.gz chat-c5f105787c7d740eaa9fb01891711a6fb72f7480.tar.bz2 chat-c5f105787c7d740eaa9fb01891711a6fb72f7480.zip |
Added CMD+UP for OSX (#2987)
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/create_comment.jsx | 4 | ||||
-rw-r--r-- | webapp/components/create_post.jsx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx index c25be8716..8a078eb73 100644 --- a/webapp/components/create_comment.jsx +++ b/webapp/components/create_comment.jsx @@ -205,7 +205,7 @@ class CreateComment extends React.Component { return; } - if (!e.ctrlKey && e.keyCode === KeyCodes.UP && this.state.messageText === '') { + if (!e.ctrlKey && !e.metaKey && e.keyCode === KeyCodes.UP && this.state.messageText === '') { e.preventDefault(); const lastPost = PostStore.getCurrentUsersLatestPost(this.props.channelId, this.props.rootId); @@ -224,7 +224,7 @@ class CreateComment extends React.Component { }); } - if (e.ctrlKey && e.keyCode === KeyCodes.UP) { + if ((e.ctrlKey || e.metaKey) && e.keyCode === KeyCodes.UP) { const lastPost = PostStore.getCurrentUsersLatestPost(this.props.channelId, this.props.rootId); if (!lastPost) { return; diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index 863f969df..32f1b387a 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -351,7 +351,7 @@ class CreatePost extends React.Component { return; } - if (!e.ctrlKey && e.keyCode === KeyCodes.UP && this.state.messageText === '') { + if (!e.ctrlKey && !e.metaKey && e.keyCode === KeyCodes.UP && this.state.messageText === '') { e.preventDefault(); const channelId = ChannelStore.getCurrentId(); @@ -373,7 +373,7 @@ class CreatePost extends React.Component { }); } - if (e.ctrlKey && e.keyCode === KeyCodes.UP) { + if ((e.ctrlKey || e.metaKey) && e.keyCode === KeyCodes.UP) { const channelId = ChannelStore.getCurrentId(); const lastPost = PostStore.getCurrentUsersLatestPost(channelId); if (!lastPost) { |