safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-659: Do not ignore keydown if e.key is present. Pull keysym from e.key in keyup if possible.

Browse Source
This commit is contained in:
Michael Jumper
2014-09-19 01:03:25 -07:00
parent 7d8958ed48
commit 7b6432e2cb
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guacamole-common-js/src/main/webapp/modules/Keyboard.js
View File

@@ -497,7 +497,7 @@ Guacamole.Keyboard = function(element) {
var location = e.location || e.keyLocation || 0; var location = e.location || e.keyLocation || 0;
// Ignore any unknown key events // Ignore any unknown key events
if (!keynum) { if (!keynum && !e.key) {
e.preventDefault(); e.preventDefault();
return; return;
} }
@@ -593,11 +593,18 @@ Guacamole.Keyboard = function(element) {
if (window.event) keynum = window.event.keyCode; if (window.event) keynum = window.event.keyCode;
else if (e.which) keynum = e.which; else if (e.which) keynum = e.which;
// Get key location
var location = e.location || e.keyLocation || 0;
// Fix modifier states // Fix modifier states
update_modifier_state(e); update_modifier_state(e);
// Send release event if original key known // Derive keysym from current or past events
var keysym = keydownChar[keynum]; var keysym = keydownChar[keynum];
if (e.key)
keysym = keysym || keysym_from_key_identifier(e.key, location);
// Send release event if original key known
if (keysym !== null) if (keysym !== null)
release_key(keysym); release_key(keysym);