From 97038c2183c9f2c6f427825e121f841db01eb1c8 Mon Sep 17 00:00:00 2001
From: Luiza Pagliari <lpagliari@gmail.com>
Date: Thu, 11 May 2017 12:35:25 -0300
Subject: [PATCH] [fix] Fix shortcut enabling flag for 'ESC'

This is an adjustment to #2891.
---
 settings.json.template      | 1 +
 src/node/utils/Settings.js  | 1 +
 src/static/js/ace2_inner.js | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings.json.template b/settings.json.template
index e89f43036..b0bbfbde6 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -80,6 +80,7 @@
     "cmdShift2" : true, /* shows a gritter popup showing a line author */
     "delete"    : true,
     "return"    : true,
+    "esc"       : true, /* in mozilla versions 14-19 avoid reconnecting pad */
     "cmdS"      : true, /* save a revision */
     "tab"       : true, /* indent */
     "cmdZ"      : true, /* undo/redo */
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 5060d28f4..e9b02449e 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -111,6 +111,7 @@ exports.padShortcutEnabled = {
   "delete" : true,
   "cmdShift2" : true,
   "return" : true,
+  "esc" : true,
   "cmdS" : true,
   "tab" : true,
   "cmdZ" : true,
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 3b103988e..a0030c62f 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3847,7 +3847,7 @@ function Ace2Inner(){
           }, 0);
           specialHandled = true;
         }
-        if ((!specialHandled) && isTypeForSpecialKey && keyCode == 27 && padShortcutEnabled.cmdS)
+        if ((!specialHandled) && isTypeForSpecialKey && keyCode == 27 && padShortcutEnabled.esc)
         {
           // prevent esc key;
           // in mozilla versions 14-19 avoid reconnecting pad.