diff options
| author | Luiza Pagliari <lpagliari@gmail.com> | 2017-05-11 12:35:25 -0300 |
|---|---|---|
| committer | Luiza Pagliari <lpagliari@gmail.com> | 2017-05-11 12:36:20 -0300 |
| commit | 97038c2183c9f2c6f427825e121f841db01eb1c8 (patch) | |
| tree | 8f867bf17d8f3023b74a81bbc23dd25833557b79 /src | |
| parent | 688e8f37a3a9557f5cec13692d97da01bfa19bf7 (diff) | |
| download | etherpad-lite-97038c2183c9f2c6f427825e121f841db01eb1c8.zip | |
[fix] Fix shortcut enabling flag for 'ESC'
This is an adjustment to #2891.
Diffstat (limited to 'src')
| -rw-r--r-- | src/node/utils/Settings.js | 1 | ||||
| -rw-r--r-- | src/static/js/ace2_inner.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 5060d28f..e9b02449 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 3b103988..a0030c62 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. |