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

Client now handles tunnel errors.

Browse Source
This commit is contained in:
Michael Jumper
2011-07-13 00:17:34 -07:00
parent 0452f36f04
commit b567591395
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole-common-js/src/main/resources/guacamole.js
View File

@@ -44,6 +44,11 @@ Guacamole.Client = function(display, tunnel) {
tunnel.oninstruction = doInstruction; tunnel.oninstruction = doInstruction;
tunnel.onerror = function(message) {
if (guac_client.onerror)
guac_client.onerror(message);
};
// Display must be relatively positioned for mouse to be handled properly // Display must be relatively positioned for mouse to be handled properly
display.style.position = "relative"; display.style.position = "relative";

12
guacamole-common-js/src/main/resources/tunnel.js
View File

@@ -169,8 +169,8 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
return; return;
} }
// Start next request as soon as possible // Start next request as soon as possible IF request was successful
if (xmlhttprequest.readyState >= 2 && nextRequest == null) if (xmlhttprequest.readyState >= 2 && nextRequest == null && xmlhttprequest.status == 200)
nextRequest = makeRequest(); nextRequest = makeRequest();
// Parse stream when data is received and when complete. // Parse stream when data is received and when complete.
@@ -185,8 +185,14 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
clearInterval(interval); clearInterval(interval);
} }
// If canceled, stop transfer
if (xmlhttprequest.status == 0) {
tunnel.disconnect();
return;
}
// Halt on error during request // Halt on error during request
if (xmlhttprequest.status == 0 || xmlhttprequest.status != 200) { else if (xmlhttprequest.status != 200) {
// Get error message (if any) // Get error message (if any)
var message = xmlhttprequest.getResponseHeader("X-Guacamole-Error-Message"); var message = xmlhttprequest.getResponseHeader("X-Guacamole-Error-Message");