From 48708d5738a0cd5341e58ebecc52b379b09ba089 Mon Sep 17 00:00:00 2001
From: tommypacker <tommypacker@gmail.com>
Date: Tue, 8 May 2018 00:47:33 -0500
Subject: [PATCH] Close emoji panel on escape press

---
 js/views/conversation_view.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index dc49b33ed..715cc9b79 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -223,6 +223,7 @@
     },
 
     events: {
+      'keydown': 'escapeEmojiPanel',
       'submit .send': 'checkUnverifiedSendMessage',
       'input .send-message': 'updateMessageFieldSize',
       'keydown .send-message': 'updateMessageFieldSize',
@@ -1201,6 +1202,13 @@
         this.closeEmojiPanel();
       }
     },
+    escapeEmojiPanel(e){
+      // Close emoji panel on escape key press
+      const keyCode = e.keyCode || e.which;
+      if (keyCode == 27 && this.emojiPanel != null) {
+        this.closeEmojiPanel();
+      }
+    },
     openEmojiPanel() {
       this.$emojiPanelContainer.outerHeight(200);
       this.emojiPanel = new EmojiPanel(this.$emojiPanelContainer[0], {