jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2322 from ajaxorg/altgr

Browse source 
Fix altgr handling
This commit is contained in:
Ruben Daniels 2015-02-16 11:27:45 -08:00
commit 2ff39c2192
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/commands/default_commands.js
View file

@ -123,7 +123,7 @@ exports.commands = [{
readOnly: true
}, {
name: "foldall",
bindKey: bindKey("Ctrl-Alt-0", "Ctrl-Command-Option-0"),
bindKey: bindKey(null, "Ctrl-Command-Option-0"),
exec: function(editor) { editor.session.foldAll(); },
scrollIntoView: "center",
readOnly: true

11
lib/ace/lib/event.js
View file

@ -241,12 +241,11 @@ function normalizeCommandKeys(callback, e, keyCode) {
if (keyCode === 18 || keyCode === 17) {
var location = "location" in e ? e.location : e.keyLocation;
if (keyCode === 17 && location === 1) {
ts = e.timeStamp;
if (pressedKeys[keyCode] == 1)
ts = e.timeStamp;
} else if (keyCode === 18 && hashId === 3 && location === 2) {
var dt = -ts;
ts = e.timeStamp;
dt += ts;
if (dt < 3)
var dt = e.timestamp - ts;
if (dt < 50)
pressedKeys.altGr = true;
}
}
@ -309,7 +308,7 @@ exports.addCommandKeyListener = function(el, callback) {
var lastDefaultPrevented = null;
addListener(el, "keydown", function(e) {
pressedKeys[e.keyCode] = true;
pressedKeys[e.keyCode] = (pressedKeys[e.keyCode] || 0) + 1;
var result = normalizeCommandKeys(callback, e, e.keyCode);
lastDefaultPrevented = e.defaultPrevented;
return result;