safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 06:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-963: Properly initialize clipboardData.

Browse Source
This commit is contained in:
Michael Jumper
2015-01-02 20:39:21 -08:00
parent bce2270952
commit 30002b2160
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/src/main/webapp/app/client/controllers/clientController.js
View File

@@ -318,7 +318,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
$scope.$watch('menuShown', function menuVisibilityChanged(menuShown, menuShownPreviousState) { $scope.$watch('menuShown', function menuVisibilityChanged(menuShown, menuShownPreviousState) {
// Send clipboard data if menu is hidden // Send clipboard data if menu is hidden
if (!menuShown && menuShownPreviousState && angular.isString($scope.client.clipboardData)) if (!menuShown && menuShownPreviousState)
$scope.$broadcast('guacClipboard', 'text/plain', $scope.client.clipboardData); $scope.$broadcast('guacClipboard', 'text/plain', $scope.client.clipboardData);
// Disable client keyboard if the menu is shown // Disable client keyboard if the menu is shown

2
guacamole/src/main/webapp/app/client/types/ManagedClient.js
View File

@@ -99,7 +99,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
* *
* @type String * @type String
*/ */
this.clipboardData = template.clipboardData; this.clipboardData = template.clipboardData || '';
/** /**
* All downloaded files. As files are downloaded, their progress can be * All downloaded files. As files are downloaded, their progress can be