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

Use tap+hold for click+drag.

Browse Source
This commit is contained in:
Michael Jumper
2014-03-04 15:14:56 -08:00
parent 6d1c9ba550
commit e54d164113
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,6 +711,11 @@ Guacamole.Mouse.Touchscreen = function(element) {
*/ */
var click_start_y = null; var click_start_y = null;
/**
* The timeout associated with the delayed, cancellable click release.
*/
var click_release_timeout = null;
/** /**
* The distance a two-finger touch must move per scrollwheel event, in * The distance a two-finger touch must move per scrollwheel event, in
* pixels. * pixels.
@@ -780,6 +785,13 @@ Guacamole.Mouse.Touchscreen = function(element) {
if (e.touches.length !== 0 || e.changedTouches.length !== 1) if (e.touches.length !== 0 || e.changedTouches.length !== 1)
return; return;
// Always release mouse button if pressed
if (guac_touchscreen.currentState.left) {
guac_touchscreen.currentState.left = false;
if (guac_touchscreen.onmouseup)
guac_touchscreen.onmouseup(guac_touchscreen.currentState);
}
// If finger hasn't moved enough to cancel the click // If finger hasn't moved enough to cancel the click
var touch = e.changedTouches[0]; var touch = e.changedTouches[0];
if ( Math.abs(touch.clientX - click_start_x) < guac_touchscreen.clickMoveThreshold if ( Math.abs(touch.clientX - click_start_x) < guac_touchscreen.clickMoveThreshold
@@ -787,19 +799,22 @@ Guacamole.Mouse.Touchscreen = function(element) {
e.preventDefault(); e.preventDefault();
// Press button // If not yet pressed, press and start delay release
guac_touchscreen.currentState.left = true; if (!guac_touchscreen.currentState.left) {
// Fire press event, if defined // Press button
if (guac_touchscreen.onmousedown) guac_touchscreen.currentState.left = true;
guac_touchscreen.onmousedown(guac_touchscreen.currentState); if (guac_touchscreen.onmousedown)
guac_touchscreen.onmousedown(guac_touchscreen.currentState);
// Release button // Release button after a delay, if not canceled
guac_touchscreen.currentState.left = false; click_release_timeout = window.setTimeout(function() {
guac_touchscreen.currentState.left = false;
if (guac_touchscreen.onmouseup)
guac_touchscreen.onmouseup(guac_touchscreen.currentState);
}, guac_touchscreen.clickTimingThreshold);
// Fire release event when the last touch is released, if event defined }
if (guac_touchscreen.onmouseup)
guac_touchscreen.onmouseup(guac_touchscreen.currentState);
} }
@@ -820,6 +835,12 @@ Guacamole.Mouse.Touchscreen = function(element) {
click_start_x = touch.clientX; click_start_x = touch.clientX;
click_start_y = touch.clientY; click_start_y = touch.clientY;
// Clear timeout, if set
if (click_release_timeout) {
window.clearTimeout(click_release_timeout);
click_release_timeout = null;
}
}, false); }, false);
element.addEventListener("touchmove", function(e) { element.addEventListener("touchmove", function(e) {
@@ -832,6 +853,7 @@ Guacamole.Mouse.Touchscreen = function(element) {
if (guac_touchscreen.currentState.left) { if (guac_touchscreen.currentState.left) {
e.preventDefault(); e.preventDefault();
e.stopPropagation();
// Get touch // Get touch
var touch = e.touches[0]; var touch = e.touches[0];