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

Track pressed state for modifiers globally. Do not track pressed state of non-modifiers.

Browse Source
This commit is contained in:
Michael Jumper
2012-01-21 12:58:44 -08:00
parent 53683c90d2
commit c210444fac
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
guacamole-common-js/src/main/resources/oskeyboard.js
View File

@@ -249,23 +249,20 @@ Guacamole.OnScreenKeyboard = function(url) {
// Update modifier state // Update modifier state
if (cap.modifier) { if (cap.modifier) {
// Toggle pressed state
key.pressed = !key.pressed;
// Construct classname for modifier // Construct classname for modifier
var modifierClass = "guac-keyboard-modifier-" + cap.modifier; var modifierClass = "guac-keyboard-modifier-" + cap.modifier;
var modifierFlag = getModifier(cap.modifier);
// Toggle modifier state
on_screen_keyboard.modifiers ^= modifierFlag;
// Activate modifier if pressed // Activate modifier if pressed
if (key.pressed) { if (on_screen_keyboard.modifiers & modifierFlag)
on_screen_keyboard.modifiers |= getModifier(cap.modifier);
keyboard.classList.add(modifierClass); keyboard.classList.add(modifierClass);
}
// Deactivate if not pressed // Deactivate if not pressed
else { else
on_screen_keyboard.modifiers &= ~getModifier(cap.modifier);
keyboard.classList.remove(modifierClass); keyboard.classList.remove(modifierClass);
}
} }
@@ -374,11 +371,6 @@ Guacamole.OnScreenKeyboard.Key = function() {
*/ */
this.size = 1; this.size = 1;
/**
* Whether this key is currently pressed.
*/
this.pressed = false;
/** /**
* An associative map of all caps by modifier. * An associative map of all caps by modifier.
*/ */