From cd4fcabe3a71db28e6a5804f7ee399295414e3ae Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Sun, 14 Jan 2018 19:48:41 -0500 Subject: [PATCH] GUACAMOLE-113: Style and comment cleanup. --- .../app/client/controllers/clientController.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js index bf692bcde..a21c0a200 100644 --- a/guacamole/src/main/webapp/app/client/controllers/clientController.js +++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js @@ -551,10 +551,19 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams !_.isEmpty(_.pick(ALT_KEYS, currentKeysPressedKeys)) && !_.isEmpty(_.pick(CTRL_KEYS, currentKeysPressedKeys)) ) { - event.preventDefault(); - delete keysCurrentlyPressed[keysym]; - substituteKeysPressed[keysym] = DEL_KEY; - $scope.$broadcast('guacSyntheticKeydown', DEL_KEY); + + // Don't send this event through to the client. + event.preventDefault(); + + // Remove the original key press + delete keysCurrentlyPressed[keysym]; + + // Record the substituted key press so that it can be + // properly dealt with later. + substituteKeysPressed[keysym] = DEL_KEY; + + // Send through the delete key. + $scope.$broadcast('guacSyntheticKeydown', DEL_KEY); } });