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

GUAC-556: Fix JavaScript definitions of UPSTREAM_TIMEOUT and UPSTREAM_ERROR - they were swapped.

Browse Source
This commit is contained in:
Michael Jumper
2014-03-19 22:12:16 -07:00
parent b976cd3a29
commit ec614c2f83
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole-common-js/src/main/webapp/modules/Status.js
View File

@@ -100,21 +100,21 @@ Guacamole.Status.Code = {
*/ */
"SERVER_BUSY": 0x0201, "SERVER_BUSY": 0x0201,
/**
* The operation could not be performed because the upstream server is not
* responding.
*
* @type Number
*/
"UPSTREAM_ERROR": 0x0202,
/** /**
* The operation was unsuccessful due to an error or otherwise unexpected * The operation was unsuccessful due to an error or otherwise unexpected
* condition of the upstream server. * condition of the upstream server.
* *
* @type Number * @type Number
*/ */
"UPSTREAM_TIMEOUT": 0x0203, "UPSTREAM_TIMEOUT": 0x0202,
/**
* The operation could not be performed because the upstream server is not
* responding.
*
* @type Number
*/
"UPSTREAM_ERROR": 0x0203,
/** /**
* The operation could not be performed as the requested resource does not * The operation could not be performed as the requested resource does not

20
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -72,14 +72,14 @@ GuacUI.Client = {
because there are too many active connections. Please wait \ because there are too many active connections. Please wait \
a few minutes and try again.", a few minutes and try again.",
0x0202: "The remote desktop server encountered an error and has closed \ 0x0202: "The Guacamole server has closed the connection because the \
the connection. Please try again or contact your system \
administrator.",
0x0203: "The Guacamole server has closed the connection because the \
remote desktop is taking too long to respond. Please try \ remote desktop is taking too long to respond. Please try \
again or contact your system administrator.", again or contact your system administrator.",
0x0203: "The remote desktop server encountered an error and has closed \
the connection. Please try again or contact your system \
administrator.",
0x0204: "The requested connection does not exist. Please check the \ 0x0204: "The requested connection does not exist. Please check the \
connection name and try again.", connection name and try again.",
@@ -124,14 +124,14 @@ GuacUI.Client = {
0x0201: "Too many files are currently being transferred. Please wait \ 0x0201: "Too many files are currently being transferred. Please wait \
for existing transfers to complete, and then try again.", for existing transfers to complete, and then try again.",
0x0202: "The remote desktop server encountered an error during \ 0x0202: "The file cannot be transferred because the remote desktop \
transfer. Please try again or contact your system \
administrator.",
0x0203: "The file cannot be transferred because the remote desktop \
server is taking too long to respond. Please try again or \ server is taking too long to respond. Please try again or \
or contact your system administrator.", or contact your system administrator.",
0x0203: "The remote desktop server encountered an error during \
transfer. Please try again or contact your system \
administrator.",
0x0204: "The destination for the file transfer does not exist. Please \ 0x0204: "The destination for the file transfer does not exist. Please \
check that the destionation exists and try again.", check that the destionation exists and try again.",