From 22a32c09c47819a13d37b418df73ba9d1b825344 Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@humbughq.com>
Date: Wed, 24 Oct 2012 18:15:36 -0400
Subject: [PATCH] Add a shortcut to pull up the shortcuts dialog.

(imported from commit 0d6d3ba78a06f0eb1ecba8e6a571b79709980cef)
---
 templates/zephyr/keyboard_shortcuts.html | 6 ++++++
 zephyr/static/js/hotkey.js               | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/templates/zephyr/keyboard_shortcuts.html b/templates/zephyr/keyboard_shortcuts.html
index 8f3153eb4d..9b6645f585 100644
--- a/templates/zephyr/keyboard_shortcuts.html
+++ b/templates/zephyr/keyboard_shortcuts.html
@@ -83,6 +83,12 @@
         <td class="hotkey">Spacebar</td>
         <td class="definition">Scroll down several messages</td>
       </tr>
+
+      <tr><th class="hotkey_heading" colspan="2">Miscellaneous</th></tr>
+      <tr>
+        <td class="hotkey">?</td>
+        <td class="definition">Open keyboard shortcut help</td>
+      </tr>
     </table>
 
   </div>
diff --git a/zephyr/static/js/hotkey.js b/zephyr/static/js/hotkey.js
index 5ea144f00b..4326e5dbf4 100644
--- a/zephyr/static/js/hotkey.js
+++ b/zephyr/static/js/hotkey.js
@@ -110,6 +110,9 @@ function process_hotkey(code) {
     case 82: // 'R': respond to author
         respond_to_message("personal");
         return process_hotkey;
+    case 63: // '?': Show keyboard shortcuts page
+        $('#keyboard-shortcuts').modal('show');
+        return process_hotkey;
     }
 
     return false;