Changeset 73ff5ff in guacamole-common-js

Timestamp:

04/09/12 16:57:58 (14 months ago)

Author:

zhangmaike

Branches:

master, guacamole-debian-parent, unstable

Children:

6fe74a6

Parents:

6701f31

git-author:

Michael Jumper <zhangmaike@…> (04/09/12 16:57:58)

git-committer:

Michael Jumper <zhangmaike@…> (04/09/12 16:57:58)

Message:

Fix non-left mouse button clicks (there may not be one touchstart event per touch). Fix setting/resetting of gesture_in_progress flag.

File:

• src/main/resources/mouse.js (modified) (4 diffs)

src/main/resources/mouse.js

@@ -164 +164 @@
     var last_touch_time = 0;
     var pixels_moved = 0;
-    var touch_distance = 0;
 
     var touch_buttons = {
@@ -177 +176 @@
     element.addEventListener("touchend", function(e) {
         
+        cancelEvent(e);
+            
         // If we're handling a gesture AND this is the last touch
         if (gesture_in_progress && e.touches.length == 0) {
-            
-            cancelEvent(e);
             
             var time = new Date().getTime();
@@ -221 +220 @@
                         guac_mouse.onmouseup(guac_mouse.currentState);
                     
-                    // Allow mouse events now that touching is over
+                    // Gesture now over
                     gesture_in_progress = false;
-            
+
                 }, guac_mouse.clickTimingThreshold);
 
             }
 
+            // If we're not waiting to see if this is a click, stop gesture
+            if (!click_release_timeout)
+                gesture_in_progress = false;
+
         }
 
@@ -233 +236 @@
 
     element.addEventListener("touchstart", function(e) {
+
+        cancelEvent(e);
 
         // Track number of touches, but no more than three
         touch_count = Math.min(e.touches.length, 3);
 
+        // Clear timeout, if set
+        if (click_release_timeout) {
+            window.clearTimeout(click_release_timeout);
+            click_release_timeout = null;
+        }
+
         // Record initial touch location and time for touch movement
         // and tap gestures
-        if (e.touches.length == 1) {
-
-            cancelEvent(e);
+        if (!gesture_in_progress) {
 
             // Stop mouse events while touching
             gesture_in_progress = true;
-
-            // Clear timeout, if set
-            if (click_release_timeout) {
-                window.clearTimeout(click_release_timeout);
-                click_release_timeout = null;
-            }
 
             // Record touch location and time