adam/guacamole-client
1
0 Fork 0
Code Issues Pull Requests 1 Packages Releases Wiki Activity

GUAC-324: Speed up animation, show menu when Ctrl-Alt-Shift is pressed.

Browse Source
This commit is contained in:
Michael Jumper committed 2014-04-22 11:42:59 -07:00
1 parent f9c9b67e72
commit d3dc38f869
2 files changed
+8 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

guacamole/src/main/webapp/scripts/client-ui.js
+4 -14
View File
@@ -1270,21 +1270,11 @@ GuacUI.Client.attach = function(guac) {
guac.sendKeyEvent(0, keysym);
// If lifting up on shift, toggle keyboard if rest of gesture
// If lifting up on shift, toggle menu visibility if rest of gesture
// conditions satisfied
if (show_keyboard_gesture_possible && keysym === 0xFFE1) {
if (keyboard.pressed[0xFFE3] && keyboard.pressed[0xFFE9]) {
// If in INTERACTIVE mode, switch to OSK
if (GuacUI.StateManager.getState() === GuacUI.Client.states.INTERACTIVE)
GuacUI.StateManager.setState(GuacUI.Client.states.OSK);
// If in OSK mode, switch to INTERACTIVE
else if (GuacUI.StateManager.getState() === GuacUI.Client.states.OSK)
GuacUI.StateManager.setState(GuacUI.Client.states.INTERACTIVE);
}
}
if (show_keyboard_gesture_possible && keysym === 0xFFE1
&& keyboard.pressed[0xFFE3] && keyboard.pressed[0xFFE9])
GuacUI.Client.showMenu(!GuacUI.Client.isMenuShown());
// Detect if no keys are pressed
var reset_gesture = true;