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

Do not handle keypress if we already handled the event in keydown.

Browse Source
This commit is contained in:
Michael Jumper
2012-07-27 13:21:45 -07:00
parent 8f8b41fe8b
commit 078322f808
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
guacamole-common-js/src/main/resources/keyboard.js
View File

@@ -357,6 +357,7 @@ Guacamole.Keyboard = function(element) {
} }
var expect_keypress = true;
var keydown_code = null; var keydown_code = null;
var deferred_keypress = null; var deferred_keypress = null;
@@ -432,7 +433,7 @@ Guacamole.Keyboard = function(element) {
return; return;
} }
var expect_keypress = true; expect_keypress = true;
// Ctrl/Alt/Shift // Ctrl/Alt/Shift
if (keynum == 16) guac_keyboard.modifiers.shift = true; if (keynum == 16) guac_keyboard.modifiers.shift = true;
@@ -490,6 +491,10 @@ Guacamole.Keyboard = function(element) {
e.preventDefault(); 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; var keynum;
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;