From d8d17522aa7376f24970c600b70772cb7c0121dd 2011-10-17 22:02:05
From: MinRK <benjaminrk@gmail.com>
Date: 2011-10-17 22:02:05
Subject: [PATCH] show_keyboard_shortcuts -> toggle_keyboard_shortcuts

Now multiple calls no longer show multiple instances of the shortcut dialog.  Rather, clicking the quick help, or invoking `C-m h` will hide
the dialog if shown.
---

diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js
index 746ec8c..14a730d 100644
--- a/IPython/frontend/html/notebook/static/js/notebook.js
+++ b/IPython/frontend/html/notebook/static/js/notebook.js
@@ -147,7 +147,7 @@ var IPython = (function (IPython) {
                 return false;
             } else if (event.which === 72 && that.control_key_active) {
                 // Show keyboard shortcuts = h
-                that.show_keyboard_shortcuts();
+                that.toggle_keyboard_shortcuts();
                 that.control_key_active = false;
                 return false;
             } else if (that.control_key_active) {
@@ -196,8 +196,17 @@ var IPython = (function (IPython) {
     };
 
 
-    Notebook.prototype.show_keyboard_shortcuts = function () {
+    Notebook.prototype.toggle_keyboard_shortcuts = function () {
+        // toggles display of keyboard shortcut dialog
+        var that = this;
+        if ( this.shortcut_dialog ){
+            // if dialog is already shown, close it
+            this.shortcut_dialog.dialog("close");
+            this.shortcut_dialog = null;
+            return;
+        }
         var dialog = $('<div/>');
+        this.shortcut_dialog = dialog;
         var shortcuts = [
             {key: 'Shift-Enter', help: 'run cell'},
             {key: 'Ctrl-Enter', help: 'run cell in-place'},
@@ -223,6 +232,10 @@ var IPython = (function (IPython) {
                 append($('<span/>').addClass('shortcut_descr').html(' : ' + shortcuts[i].help))
             );
         };
+        dialog.bind('dialogclose', function(event) {
+            // dialog has been closed, allow it to be drawn again.
+            that.shortcut_dialog = null;
+        });
         dialog.dialog({title: 'Keyboard shortcuts'});
     };
 
diff --git a/IPython/frontend/html/notebook/static/js/quickhelp.js b/IPython/frontend/html/notebook/static/js/quickhelp.js
index b0682c0..0831819 100644
--- a/IPython/frontend/html/notebook/static/js/quickhelp.js
+++ b/IPython/frontend/html/notebook/static/js/quickhelp.js
@@ -27,7 +27,7 @@ var IPython = (function (IPython) {
     QuickHelp.prototype.bind_events = function () {
         var that = this;
         this.element.find("button#quick_help").click(function () {
-            IPython.notebook.show_keyboard_shortcuts();
+            IPython.notebook.toggle_keyboard_shortcuts();
         });
     };