From 2446860146573c85e2a70060fc5e54a8ca6d0742 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 27 Jul 2012 13:21:45 -0700 Subject: [PATCH] Do not handle keypress if we already handled the event in keydown. --- src/main/resources/keyboard.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/keyboard.js b/src/main/resources/keyboard.js index a059847..474c42b 100644 --- a/src/main/resources/keyboard.js +++ b/src/main/resources/keyboard.js @@ -357,6 +357,7 @@ Guacamole.Keyboard = function(element) { } + var expect_keypress = true; var keydown_code = null; var deferred_keypress = null; @@ -432,7 +433,7 @@ Guacamole.Keyboard = function(element) { return; } - var expect_keypress = true; + expect_keypress = true; // Ctrl/Alt/Shift if (keynum == 16) guac_keyboard.modifiers.shift = true; @@ -490,6 +491,10 @@ Guacamole.Keyboard = function(element) { e.preventDefault(); + // Do not handle if we weren't expecting this event (will have already + // been handled by keydown) + if (!expect_keypress) return; + var keynum; if (window.event) keynum = window.event.keyCode; else if (e.which) keynum = e.which; -- 1.7.10.4