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

Migrating to traditional JS handlers.

Browse Source
This commit is contained in:
Michael Jumper
2011-07-04 14:25:52 -07:00
parent fbce63ea64
commit 5815f79eef
2 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@
function GuacamoleHTTPTunnel(tunnelURL) {
var tunnel = this;
var tunnel_uuid;
var TUNNEL_CONNECT = tunnelURL + "?connect";
@@ -36,11 +38,13 @@ function GuacamoleHTTPTunnel(tunnelURL) {
// Default to polling - will be turned off automatically if not needed
var pollingMode = POLLING_ENABLED;
var instructionHandler = null;
var sendingMessages = 0;
var outputMessageBuffer = "";
// Handlers
tunnel.onerror = null;
tunnel.oninstruction = null;
function sendMessage(message) {
// Do not attempt to send messages if not connected
@@ -119,6 +123,16 @@ function GuacamoleHTTPTunnel(tunnelURL) {
// Halt on error during request
if (xmlhttprequest.status == 0 || xmlhttprequest.status != 200) {
// Get error message (if any)
var message = xmlhttprequest.getResponseHeader("X-Guacamole-Error-Message");
if (message)
message = "Internal server error";
// Call error handler
if (tunnel.onerror) tunnel.onerror(message);
// Finish
disconnect();
return;
}
@@ -160,8 +174,8 @@ function GuacamoleHTTPTunnel(tunnelURL) {
}
// Call instruction handler.
if (instructionHandler != null)
instructionHandler(opcode, parameters);
if (tunnel.oninstruction != null)
tunnel.oninstruction(opcode, parameters);
}
// Start search at end of string.
@@ -246,11 +260,8 @@ function GuacamoleHTTPTunnel(tunnelURL) {
}
// External API
this.connect = connect;
this.disconnect = disconnect;
this.sendMessage = sendMessage;
this.setInstructionHandler = function(handler) {
instructionHandler = handler;
};
tunnel.connect = connect;
tunnel.disconnect = disconnect;
tunnel.sendMessage = sendMessage;
}