You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/06/30 05:37:23 UTC
[29/32] incubator-guacamole-client git commit: GUACAMOLE-55: Do not
sync local clipboard if menu is open.
GUACAMOLE-55: Do not sync local clipboard if menu is open.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/b55c4c02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/b55c4c02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/b55c4c02
Branch: refs/heads/master
Commit: b55c4c02115f859ef67387042bc2173fbd3f2d45
Parents: 0679c10
Author: Michael Jumper <mj...@apache.org>
Authored: Wed Jun 29 19:36:39 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Wed Jun 29 19:36:39 2016 -0700
----------------------------------------------------------------------
.../main/webapp/app/client/controllers/clientController.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b55c4c02/guacamole/src/main/webapp/app/client/controllers/clientController.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index aec8252..7477abc 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -442,14 +442,13 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
$scope.$on('guacKeyup', function keyupListener(event, keysym, keyboard) {
// Sync local clipboard with any clipboard data received while this
- // key was pressed (if any)
+ // key was pressed (if any) as long as the menu is not open
var clipboardData = clipboardDataFromKey[keysym];
- if (clipboardData) {
+ if (clipboardData && !$scope.menu.shown)
clipboardService.setLocalClipboard(clipboardData);
- delete clipboardDataFromKey[keysym];
- }
// Mark key as released
+ delete clipboardDataFromKey[keysym];
delete keysCurrentlyPressed[keysym];
});