JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 13 additions & 10 deletions b/‎d3.js‎
Lines changed: 13 additions & 10 deletions
@@ -1152,7 +1152,7 @@ d3 = function() {
     return d3.rebind(drag, event, "on");
   };
   d3.behavior.zoom = function() {
-    var translate = [ 0, 0 ], translate0, scale = 1, scaleExtent = d3_behavior_zoomInfinity, mousedown = "mousedown.zoom", mousemove = "mousemove.zoom", mouseup = "mouseup.zoom", touchstart = "touchstart.zoom", touchmove = "touchmove.zoom", touchend = "touchend.zoom", event = d3_eventDispatch(zoom, "zoom"), x0, x1, y0, y1;
+    var translate = [ 0, 0 ], translate0, scale = 1, scaleExtent = d3_behavior_zoomInfinity, mousedown = "mousedown.zoom", mousemove = "mousemove.zoom", mouseup = "mouseup.zoom", touchstart = "touchstart.zoom", touchmove = "touchmove.zoom", touchend = "touchend.zoom", touchtime, event = d3_eventDispatch(zoom, "zoom"), x0, x1, y0, y1;
     function zoom() {
       this.on(mousedown, mousedowned).on(d3_behavior_zoomWheel + ".zoom", mousewheeled).on(mousemove, mousewheelreset).on("dblclick.zoom", dblclicked).on(touchstart, touchstarted);
     }
@@ -1232,15 +1232,19 @@ d3 = function() {
       }
     }
     function touchstarted() {
-      var target = this, event_ = event.of(target, arguments), locations, distance0 = 0, scale0, w = d3.select(d3_window).on(touchmove, moved).on(touchend, ended), t = d3.select(target).on(mousedown, null).on(touchstart, started), dragRestore = d3_event_dragSuppress(), touchtime;
+      var target = this, event_ = event.of(target, arguments), locations0, distance0 = 0, scale0, w = d3.select(d3_window).on(touchmove, moved).on(touchend, ended), t = d3.select(target).on(mousedown, null).on(touchstart, started), dragRestore = d3_event_dragSuppress();
       started();
-      function started() {
-        var now = Date.now(), touches = d3.touches(target);
+      function relocate() {
+        var touches = d3.touches(target);
         scale0 = scale;
-        locations = {};
+        locations0 = {};
         touches.forEach(function(t) {
-          locations[t.identifier] = location(t);
+          locations0[t.identifier] = location(t);
         });
+        return touches;
+      }
+      function started() {
+        var now = Date.now(), touches = relocate();
         if (touches.length === 1) {
           if (now - touchtime < 500) {
             var p = touches[0], l = location(touches[0]);
@@ -1256,9 +1260,9 @@ d3 = function() {
         }
       }
       function moved() {
-        var touches = d3.touches(target), p0 = touches[0], l0 = locations[p0.identifier];
+        var touches = d3.touches(target), p0 = touches[0], l0 = locations0[p0.identifier];
         if (p1 = touches[1]) {
-          var p1, l1 = locations[p1.identifier], scale1 = d3.event.scale;
+          var p1, l1 = locations0[p1.identifier], scale1 = d3.event.scale;
           if (scale1 == null) {
             var distance1 = (distance1 = p1[0] - p0[0]) * distance1 + (distance1 = p1[1] - p0[1]) * distance1;
             scale1 = distance0 && Math.sqrt(distance1 / distance0);
@@ -1273,8 +1277,7 @@ d3 = function() {
       }
       function ended() {
         if (d3.event.touches.length) {
-          touchtime = null;
-          started();
+          relocate();
         } else {
           w.on(touchmove, null).on(touchend, null);
           t.on(mousedown, mousedowned).on(touchstart, touchstarted);