scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-08 05:42:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more key handling bugs and make Key.isDown() work again.

Browse source
This commit is contained in:
Jürg Lehni 2011-05-08 15:28:35 +01:00
parent 450fadfcbf
commit 6593c07127
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ui/Key.js
View file

@ -54,12 +54,14 @@ var Key = this.Key = new function() {
// actual onKeyDown event and maps the keydown keyCode to the keypress // actual onKeyDown event and maps the keydown keyCode to the keypress
// charCode so keyup can do the right thing too. // charCode so keyup can do the right thing too.
charCodeMap = {}, // keyCode -> charCode mappings for pressed keys charCodeMap = {}, // keyCode -> charCode mappings for pressed keys
keyMap = {}, // Map for currently pressed keys
downCode; // The last keyCode from keydown downCode; // The last keyCode from keydown
function handleKey(down, keyCode, charCode, event) { function handleKey(down, keyCode, charCode, event) {
var character = String.fromCharCode(charCode), var character = String.fromCharCode(charCode),
key = keys[keyCode] || character.toLowerCase(), key = keys[keyCode] || character.toLowerCase(),
handler = down ? 'onKeyDown' : 'onKeyUp'; handler = down ? 'onKeyDown' : 'onKeyUp';
keyMap[key] = down;
if (paper.tool && paper.tool[handler]) { if (paper.tool && paper.tool[handler]) {
// Call the onKeyDown or onKeyUp handler if present // Call the onKeyDown or onKeyUp handler if present
// When the handler function returns false, prevent the // When the handler function returns false, prevent the
@ -97,7 +99,7 @@ var Key = this.Key = new function() {
}, },
keypress: function(event) { keypress: function(event) {
if (downCode !== undefined) { if (downCode != null) {
var code = event.which || event.keyCode; var code = event.which || event.keyCode;
// Link the downCode from keydown with the code form keypress, so // Link the downCode from keydown with the code form keypress, so
// keyup can retrieve that code again. // keyup can retrieve that code again.
@ -112,7 +114,7 @@ var Key = this.Key = new function() {
key = keys[code], name; key = keys[code], name;
if (key && modifiers[name = Base.camelize(key)] !== undefined) { if (key && modifiers[name = Base.camelize(key)] !== undefined) {
modifiers[name] = false modifiers[name] = false
} else if (charCodeMap[code] !== undefined) { } else if (charCodeMap[code] != null) {
handleKey(false, code, charCodeMap[code], event); handleKey(false, code, charCodeMap[code], event);
delete charCodeMap[code]; delete charCodeMap[code];
} }
@ -123,7 +125,7 @@ var Key = this.Key = new function() {
modifiers: modifiers, modifiers: modifiers,
isDown: function(key) { isDown: function(key) {
return !!activeKeys[key]; return !!keyMap[key];
} }
}; };
}; };