From 92ff80a503fece01545f48c40d5776d9c9faf8e9 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 29 Jun 2016 20:03:59 -0700 Subject: [PATCH] GUACAMOLE-55: Sync to local clipboard when client clipboardData changes. --- .../main/webapp/app/client/controllers/clientController.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js index 7477abc86..74aea6220 100644 --- a/guacamole/src/main/webapp/app/client/controllers/clientController.js +++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js @@ -396,6 +396,10 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams // Watch clipboard for new data, associating it with any pressed keys $scope.$watch('client.clipboardData', function clipboardChanged(data) { + // Sync local clipboard as long as the menu is not open + if (!$scope.menu.shown) + clipboardService.setLocalClipboard(data); + // Associate new clipboard data with any currently-pressed key for (var keysym in keysCurrentlyPressed) clipboardDataFromKey[keysym] = data;