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

GUAC-605: Move client and tunnel creation into factories. Use scope watch on ID to handle connect/disconnect.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-14 11:46:06 -08:00
parent 660828da9d
commit 4863a8e96b
5 changed files with 302 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,8 +94,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
* Parse the type, name, and id out of the url paramteres,
* as well as any extra parameters if set.
*/
$scope.type = $routeParams.type;
$scope.id = $routeParams.id;
$scope.id = $routeParams.type + '/' + $routeParams.id;
$scope.connectionParameters = $routeParams.params || '';
// Keep title in sync with connection state
@@ -197,7 +196,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
});
// Show status dialog when client errors occur
$scope.$on('guacClientError', function clientErrorListener(event, client, status, reconnect) {
$scope.$on('guacClientError', function clientErrorListener(event, client, status) {
// Hide any existing status
statusModal.deactivate();
@@ -216,7 +215,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
});
// Show status dialog when tunnel status changes
$scope.$on('guacTunnelStateChange', function tunnelStateChangeListener(event, client, status) {
$scope.$on('guacTunnelStateChange', function tunnelStateChangeListener(event, tunnel, status) {
// Hide previous status, if any
statusModal.deactivate();
@@ -232,7 +231,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
});
// Show status dialog when tunnel errors occur
$scope.$on('guacTunnelError', function tunnelErrorListener(event, client, status, reconnect) {
$scope.$on('guacTunnelError', function tunnelErrorListener(event, tunnel, status) {
// Hide any existing status
statusModal.deactivate();