From efde5fe46b2ad39f2bd2ecfbb34d3000e3de51fa Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 5 Feb 2015 18:04:52 -0800 Subject: [PATCH] GUAC-998: Prefer to use keysym from recent keydown, rather than keysym from keycode alone. --- guacamole-common-js/src/main/webapp/modules/Keyboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js index 663c28a68..249e084fe 100644 --- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js +++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js @@ -298,8 +298,8 @@ Guacamole.Keyboard = function(element) { this.location = location; // If key is known from keyCode or DOM3 alone, use that - this.keysym = keysym_from_keycode(keyCode, location) - || recentKeysym[keyCode] + this.keysym = recentKeysym[keyCode] + || keysym_from_keycode(keyCode, location) || 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