You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/04/29 20:58:44 UTC
[02/19] guacamole-client git commit: GUACAMOLE-526: Ignore failure to
read/write clipboard.
GUACAMOLE-526: Ignore failure to read/write clipboard.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/670ec390
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/670ec390
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/670ec390
Branch: refs/heads/master
Commit: 670ec390b5f33644d854d8bb98e9cff00db381db
Parents: 9a2e0c6
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Apr 24 14:42:18 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Apr 26 18:42:52 2018 -0700
----------------------------------------------------------------------
.../src/main/webapp/app/client/controllers/clientController.js | 6 +++---
.../src/main/webapp/app/index/controllers/indexController.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/670ec390/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 8a2f935..e89f241 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);
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/670ec390/guacamole/src/main/webapp/app/index/controllers/indexController.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/index/controllers/indexController.js b/guacamole/src/main/webapp/app/index/controllers/indexController.js
index ed14233..c83e209 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