From 5a6623540f1594fa5c49e851e5fd1265bf2105fe Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 12 May 2014 12:25:32 -0700 Subject: [PATCH] GUAC-676: Conversion to Guacamole.Display wasn't finished - "transfer" and others still directly used layer. --- .../src/main/webapp/modules/Client.js | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js index f34eb53d6..f2f8fbbce 100644 --- a/guacamole-common-js/src/main/webapp/modules/Client.js +++ b/guacamole-common-js/src/main/webapp/modules/Client.js @@ -934,7 +934,7 @@ Guacamole.Client = function(tunnel) { var x = parseInt(parameters[1]); var y = parseInt(parameters[2]); - layer.moveTo(x, y); + display.moveTo(layer, x, y); }, @@ -974,28 +974,13 @@ Guacamole.Client = function(tunnel) { /* SRC */ if (function_index === 0x3) - dstL.put( - srcL, - srcX, - srcY, - srcWidth, - srcHeight, - dstX, - dstY - ); + display.put(srcL, srcX, srcY, srcWidth, srcHeight, + dstL, dstX, dstY); /* Anything else that isn't a NO-OP */ else if (function_index !== 0x5) - dstL.transfer( - srcL, - srcX, - srcY, - srcWidth, - srcHeight, - dstX, - dstY, - Guacamole.Client.DefaultTransferFunction[function_index] - ); + display.transfer(srcL, srcX, srcY, srcWidth, srcHeight, + dstL, dstX, dstY, Guacamole.Client.DefaultTransferFunction[function_index]); }, @@ -1009,7 +994,7 @@ Guacamole.Client = function(tunnel) { var e = parseFloat(parameters[5]); var f = parseFloat(parameters[6]); - layer.transform(a, b, c, d, e, f); + display.transform(layer, a, b, c, d, e, f); },