diff options
| author | David Lu <david.lu@hotmail.com> | 2016-05-16 19:08:59 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-05-16 16:08:59 -0700 |
| commit | 2ccf5bbaa2421c03cf932431fc0247b43b48d774 (patch) | |
| tree | 9882405423a2ab7285052b2b224e63d30b570535 /webapp/components/create_comment.jsx | |
| parent | 1b9deb43925393a52b03cd43bb733e9e602c1483 (diff) | |
| download | chat-2ccf5bbaa2421c03cf932431fc0247b43b48d774.tar.gz chat-2ccf5bbaa2421c03cf932431fc0247b43b48d774.tar.bz2 chat-2ccf5bbaa2421c03cf932431fc0247b43b48d774.zip | |
PLT-2784 Channel Navigation Shortcuts (#2979)
* Completed shortcuts
* Fixed up logic
* Removed shortcut conflicts
* Added code to limit channel navigation within group
* Made code conform to user display, fixed minor logic
* Completed shortcuts
* Fixed up logic
* Removed shortcut conflicts
* Added code to limit channel navigation within group
* Made code conform to user display, fixed minor logic
Diffstat (limited to 'webapp/components/create_comment.jsx')
| -rw-r--r-- | webapp/components/create_comment.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx index 8a078eb73..771a8ef3a 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.metaKey && e.keyCode === KeyCodes.UP && this.state.messageText === '') { + if (!e.ctrlKey && !e.metaKey && !e.altKey && !e.shiftKey && 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.metaKey) && e.keyCode === KeyCodes.UP) { + if ((e.ctrlKey || e.metaKey) && !e.altKey && !e.shiftKey && e.keyCode === KeyCodes.UP) { const lastPost = PostStore.getCurrentUsersLatestPost(this.props.channelId, this.props.rootId); if (!lastPost) { return; |