You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/10/03 18:27:03 UTC
[2/7] guacamole-client git commit: GUACAMOLE-232: Fall back to using
recent keysym only after failing to determine released key by keycode.
GUACAMOLE-232: Fall back to using recent keysym only after failing to determine released key by keycode.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/8c096778
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/8c096778
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/8c096778
Branch: refs/heads/master
Commit: 8c096778bc0235b2059495715fee91c31b719c67
Parents: 035813f
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Oct 2 22:19:15 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Oct 2 22:19:15 2018 -0700
----------------------------------------------------------------------
guacamole-common-js/src/main/webapp/modules/Keyboard.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/8c096778/guacamole-common-js/src/main/webapp/modules/Keyboard.js
----------------------------------------------------------------------
diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
index f970651..83e7944 100644
--- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js
+++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
@@ -386,8 +386,8 @@ Guacamole.Keyboard = function Keyboard(element) {
this.location = location;
// If key is known from keyCode or DOM3 alone, use that
- this.keysym = recentKeysym[keyCode]
- || keysym_from_keycode(keyCode, location)
+ this.keysym = keysym_from_keycode(keyCode, location)
+ || recentKeysym[keyCode]
|| keysym_from_key_identifier(key, location); // keyCode is still more reliable for keyup when dead keys are in use
// Keyup is as reliable as it will ever be