gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-10 00:25:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug in events.toString.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-16 18:02:16 -04:00
parent ba4b07a593
commit 1f6c944488
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/content/events.js
View File

@@ -849,7 +849,12 @@ var Events = Module("events", {
let evt_obj = { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false, let evt_obj = { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false,
keyCode: 0, charCode: 0, type: "keypress" }; keyCode: 0, charCode: 0, type: "keypress" };
if (evt_str.length > 1) { // <.*?> if (evt_str.length == 1) {
evt_obj.charCode = evt_str.charCodeAt(0);
evt_obj._keyCode = this._key_code[evt_str[0]];
evt_obj.shiftKey = evt_str !== evt_str.toLowerCase();
}
else {
let [match, modifier, keyname] = evt_str.match(/^<((?:[*12CASM]-)*)(.+?)>$/i) || [false, '', '']; let [match, modifier, keyname] = evt_str.match(/^<((?:[*12CASM]-)*)(.+?)>$/i) || [false, '', ''];
modifier = set(modifier.toUpperCase()); modifier = set(modifier.toUpperCase());
keyname = keyname.toLowerCase(); keyname = keyname.toLowerCase();
@@ -892,10 +897,6 @@ var Events = Module("events", {
continue; continue;
} }
} }
else {// a simple key (no <...>)
evt_obj.charCode = evt_str.charCodeAt(0);
evt_obj._keyCode = this._key_code[evt_str[0]];
}
// TODO: make a list of characters that need keyCode and charCode somewhere // TODO: make a list of characters that need keyCode and charCode somewhere
if (evt_obj.keyCode == 32 || evt_obj.charCode == 32) if (evt_obj.keyCode == 32 || evt_obj.charCode == 32)