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

Merge 1.5.5 changes back to master.

Browse Source
This commit is contained in:
Mike Jumper
2024-01-03 09:44:34 -08:00
parent 212955c16c f23b6671e9
commit beb09e6b20
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
guacamole/src/main/frontend/src/app/client/controllers/clientController.js
View File

@@ -487,6 +487,18 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
}); });
// Automatically update connection parameters that have been modified
// for the current focused client
$scope.$on('guacClientArgumentsUpdated', function focusedClientChanged(event, focusedClient) {
// Update available connection parameters, if the updated arguments are
// for the current focused client - otherwise ignore them
if ($scope.focusedClient && $scope.focusedClient === focusedClient)
$scope.menu.connectionParameters = focusedClient ?
ManagedClient.getArgumentModel(focusedClient) : {};
});
// Update page icon when thumbnail changes // Update page icon when thumbnail changes
$scope.$watch('focusedClient.thumbnail.canvas', function thumbnailChanged(canvas) { $scope.$watch('focusedClient.thumbnail.canvas', function thumbnailChanged(canvas) {
iconService.setIcons(canvas); iconService.setIcons(canvas);

5
guacamole/src/main/frontend/src/app/client/directives/guacTiledClients.js
View File

@@ -92,6 +92,11 @@ angular.module('client').directive('guacTiledClients', [function guacTiledClient
$scope.$emit('guacClientFocused', focusedClient); $scope.$emit('guacClientFocused', focusedClient);
}); });
// Notify whenever arguments of currently-focused client changes
$scope.$watch('getFocusedClient().arguments', function focusedClientParametersChanged() {
$scope.$emit('guacClientArgumentsUpdated', $scope.getFocusedClient());
}, true);
/** /**
* Returns a callback for guacClick that assigns or updates keyboard * Returns a callback for guacClick that assigns or updates keyboard
* focus to the given client, allowing that client to receive and * focus to the given client, allowing that client to receive and