libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2822 from storytouch/esc

Browse source 
Allow plugins handle "esc" key event
This commit is contained in:
John McLear 2015-11-02 13:08:01 +00:00
commit 2b980653d6
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3642,12 +3642,6 @@ function Ace2Inner(){
var altKey = evt.altKey; var altKey = evt.altKey;
var shiftKey = evt.shiftKey; var shiftKey = evt.shiftKey;
// prevent ESC key
if (keyCode == 27)
{
evt.preventDefault();
return;
}
// Is caret potentially hidden by the chat button? // Is caret potentially hidden by the chat button?
var myselection = document.getSelection(); // get the current caret selection var myselection = document.getSelection(); // get the current caret selection
var caretOffsetTop = myselection.focusNode.parentNode.offsetTop | myselection.focusNode.offsetTop; // get the carets selection offset in px IE 214 var caretOffsetTop = myselection.focusNode.parentNode.offsetTop | myselection.focusNode.offsetTop; // get the carets selection offset in px IE 214
@ -3840,6 +3834,15 @@ function Ace2Inner(){
}, 0); }, 0);
specialHandled = true; specialHandled = true;
} }
if ((!specialHandled) && isTypeForSpecialKey && keyCode == 27)
{
// prevent esc key;
// in mozilla versions 14-19 avoid reconnecting pad.
fastIncorp(4);
evt.preventDefault();
specialHandled = true;
}
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "s" && (evt.metaKey || evt.ctrlKey) && !evt.altKey) /* Do a saved revision on ctrl S */ if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "s" && (evt.metaKey || evt.ctrlKey) && !evt.altKey) /* Do a saved revision on ctrl S */
{ {
evt.preventDefault(); evt.preventDefault();