From 2ccf5bbaa2421c03cf932431fc0247b43b48d774 Mon Sep 17 00:00:00 2001
From: David Lu <david.lu@hotmail.com>
Date: Mon, 16 May 2016 19:08:59 -0400
Subject: 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
---
 webapp/components/create_comment.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'webapp/components/create_comment.jsx')

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;
-- 
cgit v1.2.3-1-g7c22

