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

Code cleanup.

Browse Source
This commit is contained in:
Michael Jumper
2011-10-11 15:31:01 -07:00
parent 49dd332ad9
commit 87387c5cb8
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,8 +42,6 @@ Guacamole.Client = function(display, tunnel) {
var currentState = STATE_IDLE; var currentState = STATE_IDLE;
tunnel.oninstruction = doInstruction;
tunnel.onerror = function(message) { tunnel.onerror = function(message) {
if (guac_client.onerror) if (guac_client.onerror)
guac_client.onerror(message); guac_client.onerror(message);
@@ -228,7 +226,7 @@ Guacamole.Client = function(display, tunnel) {
"error": function(parameters) { "error": function(parameters) {
if (guac_client.onerror) guac_client.onerror(parameters[0]); if (guac_client.onerror) guac_client.onerror(parameters[0]);
disconnect(); guac_client.disconnect();
}, },
"name": function(parameters) { "name": function(parameters) {
@@ -409,16 +407,16 @@ Guacamole.Client = function(display, tunnel) {
}; };
function doInstruction(opcode, parameters) { tunnel.oninstruction = function(opcode, parameters) {
var handler = instructionHandlers[opcode]; var handler = instructionHandlers[opcode];
if (handler) if (handler)
handler(parameters); handler(parameters);
} };
function disconnect() { guac_client.disconnect = function() {
// Only attempt disconnection not disconnected. // Only attempt disconnection not disconnected.
if (currentState != STATE_DISCONNECTED if (currentState != STATE_DISCONNECTED
@@ -430,9 +428,8 @@ Guacamole.Client = function(display, tunnel) {
setState(STATE_DISCONNECTED); setState(STATE_DISCONNECTED);
} }
} };
guac_client.disconnect = disconnect;
guac_client.connect = function(data) { guac_client.connect = function(data) {
setState(STATE_CONNECTING); setState(STATE_CONNECTING);
@@ -448,4 +445,5 @@ Guacamole.Client = function(display, tunnel) {
setState(STATE_WAITING); setState(STATE_WAITING);
}; };
} };

3
guacamole-common-js/src/main/resources/oskeyboard.js
View File

@@ -492,5 +492,6 @@ Guacamole.OnScreenKeyboard = function(url) {
}; };
return keyboard; return keyboard;
}
};