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-549: Use Guacamole.Status for ack messages.

Browse Source
This commit is contained in:
Michael Jumper
2014-03-19 14:35:31 -07:00
parent d4a6fd21f7
commit 6a70dd5582
4 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole-common-js/src/main/webapp/modules/ArrayBufferWriter.js
View File

@@ -39,9 +39,9 @@ Guacamole.ArrayBufferWriter = function(stream) {
var guac_writer = this;
// Simply call onack for acknowledgements
stream.onack = function(message, code) {
stream.onack = function(status) {
if (guac_writer.onack)
guac_writer.onack(message, code);
guac_writer.onack(status);
};
/**
@@ -74,9 +74,7 @@ Guacamole.ArrayBufferWriter = function(stream) {
/**
* Fired for received data, if acknowledged by the server.
* @event
* @param {String} message A human-readable status message related to the
* operation performed.
* @param {Number} code The error code associated with the operation.
* @param {Guacamole.Status} status The status of the operation.
*/
this.onack = null;

2
guacamole-common-js/src/main/webapp/modules/Client.js
View File

@@ -564,7 +564,7 @@ Guacamole.Client = function(tunnel) {
// Signal ack if handler defined
if (stream.onack)
stream.onack(reason, code);
stream.onack(new Guacamole.Status(code, reason));
// If code is an error, invalidate stream
if (code >= 0x0100) {

4
guacamole-common-js/src/main/webapp/modules/OutputStream.js
View File

@@ -48,9 +48,7 @@ Guacamole.OutputStream = function(client, index) {
* that a stream operation has completed, or an error has occurred.
*
* @event
* @param {String} message A human-readable status message related to the
* operation performed.
* @param {Number} code The error code associated with the operation.
* @param {Guacamole.Status} status The status of the operation.
*/
this.onack = null;

8
guacamole-common-js/src/main/webapp/modules/StringWriter.js
View File

@@ -39,9 +39,9 @@ Guacamole.StringWriter = function(stream) {
var guac_writer = this;
// Simply call onack for acknowledgements
stream.onack = function(message, code) {
stream.onack = function(status) {
if (guac_writer.onack)
guac_writer.onack(message, code);
guac_writer.onack(status);
};
/**
@@ -64,9 +64,7 @@ Guacamole.StringWriter = function(stream) {
/**
* Fired for received data, if acknowledged by the server.
* @event
* @param {String} message A human-readable status message related to the
* operation performed.
* @param {Number} code The error code associated with the operation.
* @param {Guacamole.Status} status The status of the operation.
*/
this.onack = null;