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

Use addEventListener(), only ignore key event if truly unknown (might have keyIdentifiier, but no keycode).

Browse Source
This commit is contained in:
Michael Jumper
2012-08-02 00:53:22 -07:00
parent ce0bade000
commit d5e1b88cdc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,7 +418,7 @@ Guacamole.Keyboard = function(element) {
} }
// When key pressed // When key pressed
element.onkeydown = function(e) { element.addEventListener("keydown", function(e) {
// Only intercept if handler set // Only intercept if handler set
if (!guac_keyboard.onkeydown) return; if (!guac_keyboard.onkeydown) return;
@@ -428,7 +428,7 @@ Guacamole.Keyboard = function(element) {
else if (e.which) keynum = e.which; else if (e.which) keynum = e.which;
// Ignore any unknown key events // Ignore any unknown key events
if (keynum == 0) { if (keynum == 0 && !e.keyIdentifier) {
e.preventDefault(); e.preventDefault();
return; return;
} }
@@ -481,10 +481,10 @@ Guacamole.Keyboard = function(element) {
handleKeyEvents(); handleKeyEvents();
} }
}; }, true);
// When key pressed // When key pressed
element.onkeypress = function(e) { element.addEventListener("keypress", function(e) {
// Only intercept if handler set // Only intercept if handler set
if (!guac_keyboard.onkeydown) return; if (!guac_keyboard.onkeydown) return;
@@ -515,10 +515,10 @@ Guacamole.Keyboard = function(element) {
// Handle event with all aggregated data // Handle event with all aggregated data
handleKeyEvents(); handleKeyEvents();
}; }, true);
// When key released // When key released
element.onkeyup = function(e) { element.addEventListener("keyup", function(e) {
// Only intercept if handler set // Only intercept if handler set
if (!guac_keyboard.onkeyup) return; if (!guac_keyboard.onkeyup) return;
@@ -545,13 +545,13 @@ Guacamole.Keyboard = function(element) {
// Send release event // Send release event
sendKeyReleased(lastKeyDownChar); sendKeyReleased(lastKeyDownChar);
}; }, true);
// When focus is lost, clear modifiers. // When focus is lost, clear modifiers.
element.onblur = function() { element.addEventListener("blur", function() {
guac_keyboard.modifiers.alt = false; guac_keyboard.modifiers.alt = false;
guac_keyboard.modifiers.ctrl = false; guac_keyboard.modifiers.ctrl = false;
guac_keyboard.modifiers.shift = false; guac_keyboard.modifiers.shift = false;
}; }, true);
}; };