libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

[fix] Fix shortcut enabling flag for 'ESC'

Browse source 
This is an adjustment to #2891.
This commit is contained in:
Luiza Pagliari 2017-05-11 12:35:25 -03:00
parent 688e8f37a3
commit 97038c2183
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
settings.json.template
View file

@ -80,6 +80,7 @@
"cmdShift2" : true, /* shows a gritter popup showing a line author */ "cmdShift2" : true, /* shows a gritter popup showing a line author */
"delete" : true, "delete" : true,
"return" : true, "return" : true,
"esc" : true, /* in mozilla versions 14-19 avoid reconnecting pad */
"cmdS" : true, /* save a revision */ "cmdS" : true, /* save a revision */
"tab" : true, /* indent */ "tab" : true, /* indent */
"cmdZ" : true, /* undo/redo */ "cmdZ" : true, /* undo/redo */

1
src/node/utils/Settings.js
View file

@ -111,6 +111,7 @@ exports.padShortcutEnabled = {
"delete" : true, "delete" : true,
"cmdShift2" : true, "cmdShift2" : true,
"return" : true, "return" : true,
"esc" : true,
"cmdS" : true, "cmdS" : true,
"tab" : true, "tab" : true,
"cmdZ" : true, "cmdZ" : true,

2
src/static/js/ace2_inner.js
View file

@ -3847,7 +3847,7 @@ function Ace2Inner(){
}, 0); }, 0);
specialHandled = true; specialHandled = true;
} }
if ((!specialHandled) && isTypeForSpecialKey && keyCode == 27 && padShortcutEnabled.cmdS) if ((!specialHandled) && isTypeForSpecialKey && keyCode == 27 && padShortcutEnabled.esc)
{ {
// prevent esc key; // prevent esc key;
// in mozilla versions 14-19 avoid reconnecting pad. // in mozilla versions 14-19 avoid reconnecting pad.