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

GUAC-804: Add onmatch to KeyboardShortcut constructor.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-15 21:56:49 -07:00
parent 8ce1940f0e
commit b1941a1219
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -759,11 +759,13 @@ GuacUI.Client.Pinch = function(element) {
* pressed. * pressed.
* *
* @constructor * @constructor
* @param Array.<Array.<Number>> pattern An array of required keys, where each * @param {Array.<Array.<Number>>} pattern An array of required keys, where each
* "required key" is itself an array of * "required key" is itself an array of
* allowed keysyms for that key. * allowed keysyms for that key.
* @param {Function} [onmatch] The function to call when the shortcut is
* matched, if any.
*/ */
GuacUI.Client.KeyboardShortcut = function(pattern) { GuacUI.Client.KeyboardShortcut = function(pattern, onmatch) {
/** /**
* Reference to this keyboard shortcut. * Reference to this keyboard shortcut.
@@ -892,7 +894,7 @@ GuacUI.Client.KeyboardShortcut = function(pattern) {
* *
* @event * @event
*/ */
this.onmatch = null; this.onmatch = onmatch;
}; };
@@ -2069,16 +2071,15 @@ GuacUI.Client.attach = function(guac) {
* Show/hide menu gesture * Show/hide menu gesture
*/ */
var toggleMenu = new GuacUI.Client.KeyboardShortcut([ var toggleMenu = new GuacUI.Client.KeyboardShortcut(
[0xFFE1, 0xFFE2], // Shift [[0xFFE1, 0xFFE2], // Shift
[0xFFE3, 0xFFE4], // Ctrl [0xFFE3, 0xFFE4], // Ctrl
[0xFFE9, 0xFFEA, 0xFE03] // Alt / AltGr [0xFFE9, 0xFFEA, 0xFE03]], // Alt / AltGr
]);
// Toggle menu when shortcut is pressed // Toggle menu when shortcut is pressed
toggleMenu.onmatch = function() { function() {
GuacUI.Client.showMenu(!GuacUI.Client.isMenuShown()); GuacUI.Client.showMenu(!GuacUI.Client.isMenuShown());
}; });
GuacUI.Client.shortcuts.push(toggleMenu); GuacUI.Client.shortcuts.push(toggleMenu);