Fix setting of state within touchscreen events.
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Tue, 22 May 2012 18:26:40 +0000 (11:26 -0700)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Sat, 28 Jul 2012 06:00:00 +0000 (23:00 -0700)
src/main/resources/mouse.js

index 6b39a0a..96a18bb 100644 (file)
@@ -604,6 +604,9 @@ Guacamole.Mouse.Touchscreen = function(element) {
         e.stopPropagation();
         e.preventDefault();
 
+        // Release button
+        guac_touchscreen.currentState.left = false;
+
         // Fire release event when the last touch is released, if event defined
         if (e.touches.length == 0 && guac_touchscreen.onmouseup)
             guac_touchscreen.onmouseup(guac_touchscreen.currentState);
@@ -619,8 +622,9 @@ Guacamole.Mouse.Touchscreen = function(element) {
         var touch = e.touches[0];
 
         // Update state
-        guac_touchscreen.currentstate.x = touch.clientX;
-        guac_touchscreen.currentstate.y = touch.clientY;
+        guac_touchscreen.currentState.left = true;
+        guac_touchscreen.currentState.x = touch.clientX;
+        guac_touchscreen.currentState.y = touch.clientY;
 
         // Fire press event, if defined
         if (guac_touchscreen.onmousedown)
@@ -638,8 +642,8 @@ Guacamole.Mouse.Touchscreen = function(element) {
         var touch = e.touches[0];
 
         // Update state
-        guac_touchscreen.currentstate.x = touch.clientX;
-        guac_touchscreen.currentstate.y = touch.clientY;
+        guac_touchscreen.currentState.x = touch.clientX;
+        guac_touchscreen.currentState.y = touch.clientY;
 
         // Fire movement event, if defined
         if (guac_touchscreen.onmousemove)