From 33bd6d4d1e7da0baca3bfc46a93d40d66864c416 Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Mon, 26 Oct 2015 08:17:47 -0700
Subject: [PATCH] Escape: Close pager if open otherwise unmark all

---
 notebook/static/notebook/js/actions.js         | 13 ++++++++++++-
 notebook/static/notebook/js/keyboardmanager.js |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/notebook/static/notebook/js/actions.js b/notebook/static/notebook/js/actions.js
index ca1b2761b..07de08acd 100644
--- a/notebook/static/notebook/js/actions.js
+++ b/notebook/static/notebook/js/actions.js
@@ -437,7 +437,18 @@ define(function(require){
                 $('.header-bar').toggle();
                 events.trigger('resize-header.Page');
             }
-        }
+        },
+        'escape': {
+            help : 'close the pager or unmark all cells',
+            handler : function(env) {
+                // Collapse the page if it is open, otherwise unmark all.
+                if (env.pager && env.pager.expanded) {
+                    env.pager.collapse();
+                } else {
+                    env.notebook.unmark_all_cells();
+                }
+            }
+        },
     };
 
     /**
diff --git a/notebook/static/notebook/js/keyboardmanager.js b/notebook/static/notebook/js/keyboardmanager.js
index d6a91579d..1c91b1d9e 100644
--- a/notebook/static/notebook/js/keyboardmanager.js
+++ b/notebook/static/notebook/js/keyboardmanager.js
@@ -96,7 +96,7 @@ define([
             'i,i' : 'jupyter-notebook:interrupt-kernel',
             '0,0' : 'jupyter-notebook:confirm-restart-kernel',
             'd,d' : 'jupyter-notebook:delete-cell',
-            'esc': 'jupyter-notebook:close-pager',
+            'esc': 'jupyter-notebook:escape',
             'up' : 'jupyter-notebook:select-previous-cell',
             'k' : 'jupyter-notebook:select-previous-cell',
             'j' : 'jupyter-notebook:select-next-cell',