From cf7339dc6d120188e58f57f478b2eae6adb2a5f6 Mon Sep 17 00:00:00 2001
From: tjkoury <tj@tjkoury.com>
Date: Mon, 12 May 2014 09:19:54 -0400
Subject: [PATCH] Merged with latest from node-RED master

---
 public/red/ui/view.js | 58 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/public/red/ui/view.js b/public/red/ui/view.js
index 7368c7e5e..3505431a3 100644
--- a/public/red/ui/view.js
+++ b/public/red/ui/view.js
@@ -60,16 +60,54 @@ RED.view = function() {
         .attr("pointer-events", "all")
         .style("cursor","crosshair");
 
-    var vis = outer
-        .append('svg:g')
-        .on("dblclick.zoom", null)
-        .append('svg:g')
-        .on("mousemove", canvasMouseMove)
-        .on("mousedown", canvasMouseDown)
-        .on("mouseup", canvasMouseUp)
-        .on("touchstart",canvasMouseDown)
-        .on("touchend",canvasMouseUp)
-        .on("touchmove",canvasMouseMove);
+     var vis = outer
+        .append('svg:g')
+        .on("dblclick.zoom", null)
+        .append('svg:g')
+        .on("mousemove", canvasMouseMove)
+        .on("mousedown", canvasMouseDown)
+        .on("mouseup", canvasMouseUp)
+        //.on("touchstart",canvasMouseDown)
+        .on("touchend",canvasMouseUp)
+        .on("touchcancel", canvasMouseUp)
+        //.on("touchmove",canvasMouseMove)
+        .on("touchstart", function(){
+          if(d3.event.touches.length>1){
+            d3.event.preventDefault();  
+            var a = d3.event.touches.item(0)['pageY']-d3.event.touches.item(1)['pageY'];
+            var b = d3.event.touches.item(0)['pageX']-d3.event.touches.item(1)['pageX'];
+            startTouchDistance = Math.sqrt((a*a)+(b*b));
+            startTouchPoint = {
+				x:Math.abs((d3.event.touches.item(0)['pageX']-d3.event.touches.item(1)['pageX'])/2),
+				y:Math.abs((d3.event.touches.item(0)['pageY']-d3.event.touches.item(1)['pageY'])/2),
+				};
+					
+          }else{
+            
+            startTouchDistance = 0;
+            canvasMouseDown();
+          }
+          
+        })
+        .on("touchmove", function(){
+            
+            if(d3.event.touches.length<2){
+              canvasMouseMove.call(this);
+         
+            }else{
+             
+              var a = d3.event.touches.item(0)['pageY']-d3.event.touches.item(1)['pageY'];
+              var b = d3.event.touches.item(0)['pageX']-d3.event.touches.item(1)['pageX'];
+              var moveTouchDistance = Math.sqrt((a*a)+(b*b));
+              if(!isNaN(moveTouchDistance)){
+                scaleFactor = Math.min(2, Math.max(0.3, scaleFactor + (Math.floor(((moveTouchDistance*100)-(startTouchDistance*100)))/6000)));
+
+                startTouchDistance = moveTouchDistance;
+                
+                redraw();
+              }
+            }
+        });
 
     var outer_background = vis.append('svg:rect')
         .attr('width', space_width)