From dd3a1af3f27e160fc758c22cde54c32330dc6501 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 28 Sep 2014 23:12:10 -0700 Subject: [PATCH] GUAC-862: Prefer keyCode to DOM3 key for keyup, as it's more accurate when dead keys are used. --- guacamole-common-js/src/main/webapp/modules/Keyboard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js index 854039d1d..6ba0a467f 100644 --- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js +++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js @@ -291,9 +291,9 @@ Guacamole.Keyboard = function(element) { this.location = location; // If key is known from keyCode or DOM3 alone, use that - this.keysym = keysym_from_key_identifier(key, location) - || keysym_from_keycode(keyCode, location) - || recentKeysym[keyCode]; + 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 this.reliable = true;