From 38e484c3a24b6abdc8d62f5b202363a113ddc1d6 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 6 Apr 2012 13:07:46 -0700 Subject: [PATCH] Simplify autoscroll. --- src/main/webapp/scripts/interface.js | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/main/webapp/scripts/interface.js b/src/main/webapp/scripts/interface.js index c5c4e65..092bcb8 100644 --- a/src/main/webapp/scripts/interface.js +++ b/src/main/webapp/scripts/interface.js @@ -476,28 +476,18 @@ GuacamoleUI.attach = function(guac) { var view_width = GuacamoleUI.viewport.offsetWidth; var view_height = GuacamoleUI.viewport.offsetHeight; - // Determine scroll amounts based on mouse position relative to document - - var scroll_amount_x; + // Scroll horizontally if necessary if (mouse_view_x > view_width) - scroll_amount_x = mouse_view_x - view_width; + GuacamoleUI.viewport.scrollLeft += mouse_view_x - view_width; else if (mouse_view_x < 0) - scroll_amount_x = mouse_view_x; - else - scroll_amount_x = 0; + GuacamoleUI.viewport.scrollLeft += mouse_view_x; - var scroll_amount_y; + // Scroll vertically if necessary if (mouse_view_y > view_height) - scroll_amount_y = mouse_view_y - view_height; + GuacamoleUI.viewport.scrollTop += mouse_view_y - view_height; else if (mouse_view_y < 0) - scroll_amount_y = mouse_view_y; - else - scroll_amount_y = 0; - - // Scroll (if necessary) to keep mouse on screen. - GuacamoleUI.viewport.scrollLeft += scroll_amount_x; - GuacamoleUI.viewport.scrollTop += scroll_amount_y; - + GuacamoleUI.viewport.scrollTop += mouse_view_y; + // Send mouse event guac.sendMouseState(mouseState); -- 1.7.10.4