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-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2820 from storytouch/fix_2818

Browse source 
Fix logic to check if any hook handled ACE key event. Fix #2818
This commit is contained in:
John McLear 2015-11-02 13:08:30 +00:00
commit c575c8b447
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3710,7 +3710,12 @@ function Ace2Inner(){
documentAttributeManager: documentAttributeManager, documentAttributeManager: documentAttributeManager,
evt:evt evt:evt
}); });
specialHandled = (specialHandledInHook&&specialHandledInHook.length>0)?specialHandledInHook[0]:specialHandled;
// if any hook returned true, set specialHandled with true
if (specialHandledInHook) {
specialHandled = _.contains(specialHandledInHook, true);
}
if ((!specialHandled) && altKey && isTypeForSpecialKey && keyCode == 120){ if ((!specialHandled) && altKey && isTypeForSpecialKey && keyCode == 120){
// Alt F9 focuses on the File Menu and/or editbar. // Alt F9 focuses on the File Menu and/or editbar.
// Note that while most editors use Alt F10 this is not desirable // Note that while most editors use Alt F10 this is not desirable