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

GUACAMOLE-724: Ensure focus is not retained when transferring a client from an unattached group to an attached group.

Browse Source
This commit is contained in:
Michael Jumper
2021-06-21 21:04:31 -07:00
parent 19a32d3e10
commit 448ebb5019
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
guacamole/src/main/frontend/src/app/client/services/guacClientManager.js
View File

@@ -95,8 +95,20 @@ angular.module('client').factory('guacClientManager', ['$injector',
// Remove client from all groups
managedClientGroups.forEach(group => {
_.remove(group.clients, client => (client.id === id));
ManagedClientGroup.recalculateTiles(group);
var removed = _.remove(group.clients, client => (client.id === id));
if (removed.length) {
// Reset focus state if client is being removed from a group
// that isn't currently attached (focus may otherwise be
// retained and result in a newly added connection unexpectedly
// sharing focus)
if (!group.attached)
removed.forEach(client => { client.clientProperties.focused = false; });
// Recalculate group grid if number of clients is changing
ManagedClientGroup.recalculateTiles(group);
}
});
// Remove any groups that are now empty