diff options
| -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) { |