From 7907be735e65c41c5a4fc703fc29026d47bec2c0 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Tue, 4 Dec 2012 10:43:25 -0500
Subject: [PATCH] hotkey: Make Enter an alias for 'r'

(imported from commit 9bf1b97304a4a4c1100826fefbba8edf1e4cff12)
---
 templates/zephyr/keyboard_shortcuts.html | 2 +-
 zephyr/static/js/hotkey.js               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/zephyr/keyboard_shortcuts.html b/templates/zephyr/keyboard_shortcuts.html
index e960267e65..35cc02cca7 100644
--- a/templates/zephyr/keyboard_shortcuts.html
+++ b/templates/zephyr/keyboard_shortcuts.html
@@ -24,7 +24,7 @@
                 <td class="definition">Compose new private message</td>
               </tr>
               <tr>
-                <td class="hotkey">r</td>
+                <td class="hotkey">Enter or r</td>
                 <td class="definition">Respond to message</td>
               </tr>
               <tr>
diff --git a/zephyr/static/js/hotkey.js b/zephyr/static/js/hotkey.js
index 7adbb1bfa4..33064ac5f2 100644
--- a/zephyr/static/js/hotkey.js
+++ b/zephyr/static/js/hotkey.js
@@ -108,6 +108,7 @@ function process_hotkey(e) {
     case 67: // 'C': compose huddle
         compose.start('private');
         return true;
+    case  13: // Enter or
     case 114: // 'r': respond to message
         respond_to_message();
         return true;