safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify Guacamole.Touchscreen to play nicely with other gesture-handling objects. Send click only on touchend. Move mouse only if related to a drag.

Browse Source
This commit is contained in:
Michael Jumper
2014-03-04 13:42:14 -08:00
parent f0c62ff82a
commit 6d1c9ba550
1 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
guacamole-common-js/src/main/webapp/modules/Mouse.js
View File

@@ -699,12 +699,36 @@ Guacamole.Mouse.Touchscreen = function(element) {
*/
var guac_touchscreen = this;
/**
* The start X location of a click (tap) gesture.
* @private
*/
var click_start_x = null;
/**
* The start Y location of a click (tap) gesture.
* @private
*/
var click_start_y = null;
/**
* The distance a two-finger touch must move per scrollwheel event, in
* pixels.
*/
this.scrollThreshold = 20 * (window.devicePixelRatio || 1);
/**
* The maximum number of milliseconds to wait for a touch to end for the
* gesture to be considered a click.
*/
this.clickTimingThreshold = 250;
/**
* The maximum number of pixels to allow a touch to move for the gesture to
* be considered a click.
*/
this.clickMoveThreshold = 10 * (window.devicePixelRatio || 1);
/**
* The current mouse state. The properties of this state are updated when
* mouse events fire. This state object is also passed in as a parameter to
@@ -753,18 +777,31 @@ Guacamole.Mouse.Touchscreen = function(element) {
element.addEventListener("touchend", function(e) {
// Ignore if more than one touch
if (e.touches.length + e.changedTouches.length !== 1)
if (e.touches.length !== 0 || e.changedTouches.length !== 1)
return;
e.stopPropagation();
e.preventDefault();
// If finger hasn't moved enough to cancel the click
var touch = e.changedTouches[0];
if ( Math.abs(touch.clientX - click_start_x) < guac_touchscreen.clickMoveThreshold
&& Math.abs(touch.clientY - click_start_y) < guac_touchscreen.clickMoveThreshold) {
// Release button
guac_touchscreen.currentState.left = false;
e.preventDefault();
// 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);
// Press button
guac_touchscreen.currentState.left = true;
// Fire press event, if defined
if (guac_touchscreen.onmousedown)
guac_touchscreen.onmousedown(guac_touchscreen.currentState);
// Release button
guac_touchscreen.currentState.left = false;
// Fire release event when the last touch is released, if event defined
if (guac_touchscreen.onmouseup)
guac_touchscreen.onmouseup(guac_touchscreen.currentState);
}
}, false);
@@ -774,19 +811,14 @@ Guacamole.Mouse.Touchscreen = function(element) {
if (e.touches.length !== 1)
return;
e.stopPropagation();
e.preventDefault();
// Get touch
var touch = e.touches[0];
// Update state
guac_touchscreen.currentState.left = true;
var touch = e.touches[0];
guac_touchscreen.currentState.fromClientPosition(element, touch.clientX, touch.clientY);
// Fire press event, if defined
if (guac_touchscreen.onmousedown)
guac_touchscreen.onmousedown(guac_touchscreen.currentState);
click_start_x = touch.clientX;
click_start_y = touch.clientY;
}, false);
@@ -796,18 +828,22 @@ Guacamole.Mouse.Touchscreen = function(element) {
if (e.touches.length !== 1)
return;
e.stopPropagation();
e.preventDefault();
// Only handle move if in process of drag
if (guac_touchscreen.currentState.left) {
// Get touch
var touch = e.touches[0];
e.preventDefault();
// Update state
guac_touchscreen.currentState.fromClientPosition(element, touch.clientX, touch.clientY);
// Get touch
var touch = e.touches[0];
// Fire movement event, if defined
if (guac_touchscreen.onmousemove)
guac_touchscreen.onmousemove(guac_touchscreen.currentState);
// Update state
guac_touchscreen.currentState.fromClientPosition(element, touch.clientX, touch.clientY);
// Fire movement event, if defined
if (guac_touchscreen.onmousemove)
guac_touchscreen.onmousemove(guac_touchscreen.currentState);
}
}, false);