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: Use status dialog from index, not status modal.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-16 23:10:49 -08:00
parent 0f159d73ad
commit 80377f6663
8 changed files with 108 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,6 @@ 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();
@@ -180,7 +179,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
// Show new status if not yet connected
if (status !== "connected") {
statusModal.showStatus({
$scope.showStatus({
title: "client.status.connectingStatusTitle",
text: "client.status.clientStates." + status
});
@@ -188,7 +187,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
// Hide status upon connecting
else
statusModal.showStatus(false);
$scope.showStatus(false);
});
@@ -201,8 +200,11 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
// Determine translation name of error
var errorName = (status in CLIENT_ERRORS) ? status.toString(16) : "DEFAULT";
// Override any existing status
$scope.showStatus(false);
// Show error status
statusModal.showStatus({
$scope.showStatus({
className: "error",
title: "client.error.connectionErrorTitle",
text: "client.error.clientErrors." + errorName,
@@ -216,7 +218,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
// Show new status only if disconnected
if (status === "closed") {
statusModal.showStatus({
$scope.showStatus({
title: "client.status.closedStatusTitle",
text: "client.status.tunnelStates." + status
});
@@ -233,8 +235,11 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
// Determine translation name of error
var errorName = (status in TUNNEL_ERRORS) ? status.toString(16) : "DEFAULT";
// Override any existing status
$scope.showStatus(false);
// Show error status
statusModal.showStatus({
$scope.showStatus({
className: "error",
title: "client.error.connectionErrorTitle",
text: "client.error.tunnelErrors." + errorName,