From 1edd4ff66bd256caef77f8624011edadbfbe7ab7 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 5 Jul 2011 10:16:28 -0700 Subject: [PATCH] More migration to traditional JS events. --- guacamole/src/main/webapp/index.xhtml | 31 +++++++-------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/guacamole/src/main/webapp/index.xhtml b/guacamole/src/main/webapp/index.xhtml index c20f880eb..ecf99309d 100644 --- a/guacamole/src/main/webapp/index.xhtml +++ b/guacamole/src/main/webapp/index.xhtml @@ -266,44 +266,29 @@ // Mouse var mouse = new GuacamoleMouse(display); - mouse.setButtonPressedHandler( + mouse.onmousedown = mouse.onmouseup = mouse.onmousemove = function(mouseState) { guac.sendMouseState(mouseState); - } - ); - - mouse.setButtonReleasedHandler( - function(mouseState) { - guac.sendMouseState(mouseState); - } - ); - - mouse.setMovementHandler( - function(mouseState) { - guac.sendMouseState(mouseState); - } - ); + }; // Keyboard var keyboard = new GuacamoleKeyboard(document); function disableKeyboard() { - keyboard.setKeyPressedHandler(null); - keyboard.setKeyReleasedHandler(null); + keyboard.onkeydown = null; + keyboard.onkeyup = null; } function enableKeyboard() { - keyboard.setKeyPressedHandler( + keyboard.onkeydown = function (keysym) { guac.sendKeyEvent(1, keysym); - } - ); + }; - keyboard.setKeyReleasedHandler( + keyboard.onkeyup = function (keysym) { guac.sendKeyEvent(0, keysym); - } - ); + }; } // Enable keyboard by default