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

GUACAMOLE-113: Code clean-up - style, comments, and unneeded variables.

Browse Source
This commit is contained in:
Nick Couchman
2018-01-13 23:15:46 -05:00
parent 5376794e05
commit 9a9b570543
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -73,14 +73,21 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
ALT_KEYS = {0xFFE9 : true, 0xFFEA : true, 0xFE03 : true, ALT_KEYS = {0xFFE9 : true, 0xFFEA : true, 0xFE03 : true,
0xFFE7 : true, 0xFFE8 : true}, 0xFFE7 : true, 0xFFE8 : true},
CTRL_KEYS = {0xFFE3 : true, 0xFFE4 : true}, CTRL_KEYS = {0xFFE3 : true, 0xFFE4 : true},
END_KEYS = {0xFF57 : true, 0xFFB1 : true},
MENU_KEYS = angular.extend({}, SHIFT_KEYS, ALT_KEYS, CTRL_KEYS); MENU_KEYS = angular.extend({}, SHIFT_KEYS, ALT_KEYS, CTRL_KEYS);
/**
* Keysym for detecting any END key presses, for the purpose of passing through
* the Ctrl-Alt-Del sequence to a remote system.
*/
END_KEYS = {0xFF57 : true, 0xFFB1 : true},
/** /**
* Keysym for sending the DELETE key when the Ctrl-Alt-End hotkey * Keysym for sending the DELETE key when the Ctrl-Alt-End hotkey
* combo is pressed. * combo is pressed.
*
* @type Number
*/ */
var DEL_KEY = 0xFFFF; var DEL_KEY = 0xFFFF;
/** /**
* All client error codes handled and passed off for translation. Any error * All client error codes handled and passed off for translation. Any error
@@ -539,8 +546,8 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
} }
} }
// If only Ctrl-Alt-End is pressed, and we have a one keysym from each // If one of the End keys is pressed, and we have a one keysym from each
// group, and one key is being released, send Ctrl-Alt-Delete. // of Ctrl and Alt groups, send Ctrl-Alt-Delete.
if (END_KEYS[keysym] && if (END_KEYS[keysym] &&
!_.isEmpty(_.pick(ALT_KEYS, currentKeysPressedKeys)) && !_.isEmpty(_.pick(ALT_KEYS, currentKeysPressedKeys)) &&
!_.isEmpty(_.pick(CTRL_KEYS, currentKeysPressedKeys)) !_.isEmpty(_.pick(CTRL_KEYS, currentKeysPressedKeys))
@@ -557,8 +564,6 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
// with any data that appears to have come from those key presses // with any data that appears to have come from those key presses
$scope.$on('guacKeyup', function keyupListener(event, keysym, keyboard) { $scope.$on('guacKeyup', function keyupListener(event, keysym, keyboard) {
var currentKeysPressedKeys = Object.keys(keysCurrentlyPressed);
// Sync local clipboard with any clipboard data received while this // Sync local clipboard with any clipboard data received while this
// key was pressed (if any) as long as the menu is not open // key was pressed (if any) as long as the menu is not open
var clipboardData = clipboardDataFromKey[keysym]; var clipboardData = clipboardDataFromKey[keysym];