From b7e3f73ffa1eefc81eaf1eb1030e58cd3d117aa0 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Mon, 30 Jan 2023 12:07:50 -0800 Subject: [PATCH] GUACAMOLE-1293: Clarify message parameter mapping with variable naming. --- guacamole-common-js/src/main/webapp/modules/Client.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js index 8f5017543..a11f8d420 100644 --- a/guacamole-common-js/src/main/webapp/modules/Client.js +++ b/guacamole-common-js/src/main/webapp/modules/Client.js @@ -1451,6 +1451,9 @@ Guacamole.Client = function(tunnel) { "msg" : function(parameters) { + var userID; + var username; + var msgid = parseInt(parameters[0]); if (guac_client.onmsg) guac_client.onmsg(msgid, parameters.slice(1)); @@ -1458,13 +1461,17 @@ Guacamole.Client = function(tunnel) { switch (msgid) { case Guacamole.Client.Message.USER_JOINED: + userID = parameters[1]; + username = parameters[2]; if (guac_client.onjoin) - guac_client.onjoin(parameters[1] /* User ID */, parameters[2] /* Name */); + guac_client.onjoin(userID, username); break; case Guacamole.Client.Message.USER_LEFT: + userID = parameters[1]; + username = parameters[2]; if (guac_client.onleave) - guac_client.onleave(parameters[1] /* User ID */, parameters[2] /* Name */); + guac_client.onleave(userID, username); break; }