From 8b58970823bfe5a5ae529ec547dee1ae24d7f693 Mon Sep 17 00:00:00 2001
From: Lucas Raby <lucas.raby@epitech.eu>
Date: Tue, 19 Jun 2018 15:54:55 +0200
Subject: [PATCH 1/2] Add pinch to zoom event handler for mobile device,
 inspired by
 https://developer.mozilla.org/en-US/docs/Web/API/Touch_events/Multi-touch_interaction

---
 core/input/mouse.js | 47 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/core/input/mouse.js b/core/input/mouse.js
index 17c8cd51..e4af8366 100644
--- a/core/input/mouse.js
+++ b/core/input/mouse.js
@@ -9,6 +9,9 @@ import * as Log from '../util/logging.js';
 import { isTouchDevice } from '../util/browser.js';
 import { setCapture, stopEvent, getPointerEvent } from '../util/events.js';
 
+var tpCache = new Array();
+var tpTreshold = null;
+
 const WHEEL_STEP = 10; // Delta threshold for a mouse wheel step
 const WHEEL_STEP_TIMEOUT = 50; // ms
 const WHEEL_LINE_HEIGHT = 19;
@@ -103,6 +106,15 @@ Mouse.prototype = {
     },
 
     _handleMouseDown: function (e) {
+        if(e.type == 'touchstart') {
+
+            if (e.targetTouches.length == 2) {
+                for (var i = 0; i < e.targetTouches.length; i++) {
+                    tpCache.push(e.targetTouches[i]);
+                }
+            }
+
+        }
         // Touch events have implicit capture
         if (e.type === "mousedown") {
             setCapture(this._target);
@@ -196,10 +208,43 @@ Mouse.prototype = {
 
     _handleMouseMove: function (e) {
         this._updateMousePosition(e);
+        this._handle_pinch_zoom(e);
         this.onmousemove(this._pos.x, this._pos.y);
         stopEvent(e);
     },
 
+    _handle_pinch_zoom (e) {
+        if(e.targetTouches) {
+            if (e.targetTouches.length == 2 && e.changedTouches.length == 2) {
+                // Check if the two target touches are the same ones that started
+                // the 2-touch
+                var point1 = -1, point2 = -1;
+                for (var i = 0; i < tpCache.length; i++) {
+                    if (tpCache[i].identifier == e.targetTouches[0].identifier) point1 = i;
+                    if (tpCache[i].identifier == e.targetTouches[1].identifier) point2 = i;
+                }
+                if (point1 >= 0 && point2 >= 0) {
+                    var tpDist = Math.abs(e.targetTouches[0].clientX - e.targetTouches[1].clientX);
+
+                    if (tpTreshold == null)
+                        tpTreshold = tpDist;
+
+                    this._accumulatedWheelDeltaY =  tpTreshold - tpDist;
+                    if (Math.abs(this._accumulatedWheelDeltaY) > WHEEL_STEP) {
+                        this._generateWheelStepY();
+                    } else {
+                        this._wheelStepYTimer = window.setTimeout(this._generateWheelStepY.bind(this), WHEEL_STEP_TIMEOUT);
+                    }
+                    tpTreshold = tpDist;
+                }
+                else {
+                    // empty tpCache
+                    tpCache = new Array();
+                }
+            }
+        }
+    },
+
     _handleMouseDisable: function (e) {
         /*
          * Stop propagation if inside canvas area
@@ -278,4 +323,4 @@ Mouse.prototype = {
 
         c.removeEventListener('contextmenu', this._eventHandlers.mousedisable);
     }
-};
+};
\ No newline at end of file

From b541aea4cda43af7529772ba54d37f239373667c Mon Sep 17 00:00:00 2001
From: Lucas Raby <lucas.raby@epitech.eu>
Date: Tue, 19 Jun 2018 16:47:30 +0200
Subject: [PATCH 2/2] noVNC coding style

---
 core/input/mouse.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/input/mouse.js b/core/input/mouse.js
index e4af8366..0e66a971 100644
--- a/core/input/mouse.js
+++ b/core/input/mouse.js
@@ -207,13 +207,13 @@ Mouse.prototype = {
     },
 
     _handleMouseMove: function (e) {
+        this._handlePinchZoom(e);
         this._updateMousePosition(e);
-        this._handle_pinch_zoom(e);
         this.onmousemove(this._pos.x, this._pos.y);
         stopEvent(e);
     },
 
-    _handle_pinch_zoom (e) {
+    _handlePinchZoom: function (e) {
         if(e.targetTouches) {
             if (e.targetTouches.length == 2 && e.changedTouches.length == 2) {
                 // Check if the two target touches are the same ones that started
@@ -226,9 +226,9 @@ Mouse.prototype = {
                 if (point1 >= 0 && point2 >= 0) {
                     var tpDist = Math.abs(e.targetTouches[0].clientX - e.targetTouches[1].clientX);
 
-                    if (tpTreshold == null)
+                    if (tpTreshold == null) {
                         tpTreshold = tpDist;
-
+                    }
                     this._accumulatedWheelDeltaY =  tpTreshold - tpDist;
                     if (Math.abs(this._accumulatedWheelDeltaY) > WHEEL_STEP) {
                         this._generateWheelStepY();
@@ -323,4 +323,4 @@ Mouse.prototype = {
 
         c.removeEventListener('contextmenu', this._eventHandlers.mousedisable);
     }
-};
\ No newline at end of file
+};