safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly check for null.

Browse Source
This commit is contained in:
Michael Jumper
2012-11-28 22:13:32 -08:00
parent d56756390d
commit d75ee89430
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,6 +335,9 @@ Guacamole.Keyboard = function(element) {
*/ */
function press_key(keysym) { function press_key(keysym) {
// Don't bother with pressing the key if the key is unknown
if (keysym == null) return;
// Only press if released // Only press if released
if (!guac_keyboard.pressed[keysym]) { if (!guac_keyboard.pressed[keysym]) {
@@ -342,7 +345,7 @@ Guacamole.Keyboard = function(element) {
guac_keyboard.pressed[keysym] = true; guac_keyboard.pressed[keysym] = true;
// Send key event // Send key event
if (keysym != null && guac_keyboard.onkeydown) { if (guac_keyboard.onkeydown) {
guac_keyboard.onkeydown(keysym); guac_keyboard.onkeydown(keysym);
// Stop any current repeat // Stop any current repeat
@@ -458,8 +461,13 @@ Guacamole.Keyboard = function(element) {
// If we do not expect to handle via keypress, handle now // If we do not expect to handle via keypress, handle now
if (!expect_keypress) { if (!expect_keypress) {
e.preventDefault(); e.preventDefault();
keydownChar[keynum] = keysym;
press_key(keysym); // Press key if known
if (keysym != null) {
keydownChar[keynum] = keysym;
press_key(keysym);
}
} }
}, true); }, true);
@@ -485,9 +493,11 @@ Guacamole.Keyboard = function(element) {
release_key(0xFFE9); release_key(0xFFE9);
} }
// Send press + release // Send press + release if keysym known
press_key(keysym); if (keysym != null) {
release_key(keysym); press_key(keysym);
release_key(keysym);
}
}, true); }, true);
@@ -508,8 +518,10 @@ Guacamole.Keyboard = function(element) {
else if (keynum == 17) guac_keyboard.modifiers.ctrl = false; else if (keynum == 17) guac_keyboard.modifiers.ctrl = false;
else if (keynum == 18) guac_keyboard.modifiers.alt = false; else if (keynum == 18) guac_keyboard.modifiers.alt = false;
// Send release event // Send release event if original key known
release_key(keydownChar[keynum]); var keydown_keysym = keydownChar[keynum];
if (keydown_keysym != null)
release_key(keydown_keysym);
// Clear character record // Clear character record
keydownChar[keynum] = null; keydownChar[keynum] = null;