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

GUAC-605: Add status strings. Show dialog when status changes.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-12 18:29:37 -08:00
parent 1fd5497382
commit 53411640a0
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
var connectionGroupDAO = $injector.get('connectionGroupDAO');
var connectionDAO = $injector.get('connectionDAO');
var ClientProperties = $injector.get('clientProperties');
var statusModal = $injector.get('statusModal');
// Client settings and state
$scope.clientProperties = new ClientProperties();
@@ -146,7 +147,22 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
$scope.$on('guacKeyup', function keyupListener(event, keysym, keyboard) {
delete keysCurrentlyPressed[keysym];
});
// Show status dialog when status changes
$scope.$on('guacClientStatusChange', function clientStatusChangeListener(event, client, status) {
// Hide previous status, if any
statusModal.deactivate();
// Show new status if not yet connected
if (status !== "connected") {
statusModal.activate({
text: "client.status." + status
});
}
});
$scope.formattedScale = function formattedScale() {
return Math.round($scope.clientProperties.scale * 100);
};

5
guacamole/src/main/webapp/app/client/directives/guacClient.js
View File

@@ -210,7 +210,7 @@ angular.module('client').directive('guacClient', [function guacClient() {
// Connected
case 3:
$scope.$emit('guacClientStatusChange', guac, null);
$scope.$emit('guacClientStatusChange', guac, "connected");
// Update server clipboard with current data
var clipboard = localStorageUtility.get("clipboard");
@@ -366,9 +366,6 @@ angular.module('client').directive('guacClient', [function guacClient() {
guac.getDisplay().showCursor(false);
};
// Hide any existing status notifications
$scope.$emit('guacClientStatusChange', guac, null);
var $display = $element.find('.display');
// Remove old client from UI, if any