From 670ec390b5f33644d854d8bb98e9cff00db381db Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 24 Apr 2018 14:42:18 -0700 Subject: [PATCH] GUACAMOLE-526: Ignore failure to read/write clipboard. --- .../main/webapp/app/client/controllers/clientController.js | 6 +++--- .../main/webapp/app/index/controllers/indexController.js | 2 +- 2 files changed, 4 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 8a2f935ed..e89f241ca 100644 --- a/guacamole/src/main/webapp/app/client/controllers/clientController.js +++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js @@ -447,7 +447,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams // Sync local clipboard as long as the menu is not open if (!$scope.menu.shown) - clipboardService.setLocalClipboard(data); + clipboardService.setLocalClipboard(data)['catch'](angular.noop); // Associate new clipboard data with any currently-pressed key for (var keysym in keysCurrentlyPressed) @@ -576,7 +576,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams // key was pressed (if any) as long as the menu is not open var clipboardData = clipboardDataFromKey[keysym]; if (clipboardData && !$scope.menu.shown) - clipboardService.setLocalClipboard(clipboardData); + clipboardService.setLocalClipboard(clipboardData)['catch'](angular.noop); // Deal with substitute key presses if (substituteKeysPressed[keysym]) { @@ -714,7 +714,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams // Sync with local clipboard clipboardService.getLocalClipboard().then(function clipboardRead(data) { $scope.$broadcast('guacClipboard', data); - }); + })['catch'](angular.noop); // Hide status notification guacNotification.showStatus(false); diff --git a/guacamole/src/main/webapp/app/index/controllers/indexController.js b/guacamole/src/main/webapp/app/index/controllers/indexController.js index ed142333e..c83e2096b 100644 --- a/guacamole/src/main/webapp/app/index/controllers/indexController.js +++ b/guacamole/src/main/webapp/app/index/controllers/indexController.js @@ -137,7 +137,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector', var checkClipboard = function checkClipboard() { clipboardService.getLocalClipboard().then(function clipboardRead(data) { $scope.$broadcast('guacClipboard', data); - }); + })['catch'](angular.noop); }; // Attempt to read the clipboard if it may have changed