JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 29 additions & 19 deletions b/‎d3.js‎
Lines changed: 29 additions & 19 deletions
@@ -1152,9 +1152,9 @@ 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", event = d3_eventDispatch(zoom, "zoom"), x0, x1, y0, y1, touchtime;
+    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;
     function zoom() {
-      this.on(mousedown, mousedowned).on(d3_behavior_zoomWheel + ".zoom", mousewheeled).on(mousemove, mousewheelreset).on("dblclick.zoom", dblclicked).on("touchstart.zoom", touchstarted);
+      this.on(mousedown, mousedowned).on(d3_behavior_zoomWheel + ".zoom", mousewheeled).on(mousemove, mousewheelreset).on("dblclick.zoom", dblclicked).on(touchstart, touchstarted);
     }
     zoom.translate = function(x) {
       if (!arguments.length) return translate;
@@ -1232,22 +1232,28 @@ d3 = function() {
       }
     }
     function touchstarted() {
-      var target = this, event_ = event.of(target, arguments), touches = d3.touches(target), locations = {}, distance0 = 0, scale0 = scale, now = Date.now(), touchmove = "touchmove.zoom", touchend = "touchend.zoom", w = d3.select(d3_window).on(touchmove, moved).on(touchend, ended), t = d3.select(target).on(mousedown, null), dragRestore = d3_event_dragSuppress();
-      touches.forEach(function(t) {
-        locations[t.identifier] = location(t);
-      });
-      if (touches.length === 1) {
-        if (now - touchtime < 500) {
-          var p = touches[0], l = location(touches[0]);
-          scaleTo(scale * 2);
-          translateTo(p, l);
-          d3_eventPreventDefault();
-          dispatch(event_);
+      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;
+      started();
+      function started() {
+        var now = Date.now(), touches = d3.touches(target);
+        scale0 = scale;
+        locations = {};
+        touches.forEach(function(t) {
+          locations[t.identifier] = location(t);
+        });
+        if (touches.length === 1) {
+          if (now - touchtime < 500) {
+            var p = touches[0], l = location(touches[0]);
+            scaleTo(scale * 2);
+            translateTo(p, l);
+            d3_eventPreventDefault();
+            dispatch(event_);
+          }
+          touchtime = now;
+        } else if (touches.length > 1) {
+          var p = touches[0], q = touches[1], dx = p[0] - q[0], dy = p[1] - q[1];
+          distance0 = dx * dx + dy * dy;
         }
-        touchtime = now;
-      } else if (touches.length > 1) {
-        var p = touches[0], q = touches[1], dx = p[0] - q[0], dy = p[1] - q[1];
-        distance0 = dx * dx + dy * dy;
       }
       function moved() {
         var touches = d3.touches(target), p0 = touches[0], l0 = locations[p0.identifier];
@@ -1266,9 +1272,13 @@ d3 = function() {
         dispatch(event_);
       }
       function ended() {
-        if (d3.event.touches.length) return;
+        if (d3.event.touches.length) {
+          touchtime = null;
+          started();
+          return;
+        }
         w.on(touchmove, null).on(touchend, null);
-        t.on(mousedown, mousedowned);
+        t.on(mousedown, mousedowned).on(touchstart, touchstarted);
         dragRestore();
       }
     }