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

GUAC-391: Add *gag* detection of OS *gag* because there's no other way *gag* to know if it's safe to wait for keypress while Alt is held when keydown is not accurate enough *vomits*.

Browse Source
This commit is contained in:
Michael Jumper
2014-09-29 02:03:32 -07:00
parent 1d42823f82
commit b6769e4ba0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guacamole-common-js/src/main/webapp/modules/Keyboard.js
View File

@@ -186,10 +186,17 @@ Guacamole.Keyboard = function(element) {
if (!this.keysym && key_identifier_sane(keyCode, keyIdentifier)) if (!this.keysym && key_identifier_sane(keyCode, keyIdentifier))
this.keysym = keysym_from_key_identifier(keyIdentifier, location, guac_keyboard.modifiers.shift); this.keysym = keysym_from_key_identifier(keyIdentifier, location, guac_keyboard.modifiers.shift);
// Determine whether default action for Alt+combinations must be prevented
var prevent_alt = !guac_keyboard.modifiers.ctrl
&& !(navigator && navigator.platform && navigator.platform.match(/^mac/i));
// Determine whether default action for Ctrl+combinations must be prevented
var prevent_ctrl = !guac_keyboard.modifiers.alt;
// We must rely on the (potentially buggy) keyIdentifier if preventing // We must rely on the (potentially buggy) keyIdentifier if preventing
// the default action is important // the default action is important
if ((guac_keyboard.modifiers.ctrl && !guac_keyboard.modifiers.alt) if ((prevent_ctrl && guac_keyboard.modifiers.ctrl)
|| (guac_keyboard.modifiers.alt && !guac_keyboard.modifiers.ctrl) || (prevent_alt && guac_keyboard.modifiers.alt)
|| guac_keyboard.modifiers.meta || guac_keyboard.modifiers.meta
|| guac_keyboard.modifiers.hyper) || guac_keyboard.modifiers.hyper)
this.reliable = true; this.reliable = true;