Remove usage of d3_array for efficiency.

This avoids unnecessarily creating a new array for every touch event.
d3 · May 12, 2011 · 1bb3e9b · 1bb3e9b
1 parent a5f1407
commit 1bb3e9b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/d3.js b/d3.js
@@ -3183,7 +3183,11 @@ function d3_svg_mousePoints(container, events) {
     d3_mouse_bug44083 = !(ctm.f || ctm.e);
     svg.remove();
   }
-  return events.map(function(e) {
+  var i = -1,
+      n = events.length,
+      points = [];
+  while (++i < n) {
+    var e = events[i];
     if (d3_mouse_bug44083) {
       point.x = e.pageX;
       point.y = e.pageY;
@@ -3192,13 +3196,14 @@ function d3_svg_mousePoints(container, events) {
       point.y = e.clientY;
     }
     point = point.matrixTransform(container.getScreenCTM().inverse());
-    return [point.x, point.y];
-  });
+    points.push([point.x, point.y]);
+  }
+  return points;
 };
 d3.svg.touches = function(container) {
   var touches = d3.event.touches;
   return touches && touches.length
-    ? d3_svg_mousePoints(container, d3_array(touches)) : [];
+    ? d3_svg_mousePoints(container, touches) : [];
 };
 d3.svg.symbol = function() {
   var type = d3_svg_symbolType,

diff --git a/d3.min.js b/d3.min.js
diff --git a/src/svg/mouse.js b/src/svg/mouse.js
@@ -17,7 +17,11 @@ function d3_svg_mousePoints(container, events) {
     d3_mouse_bug44083 = !(ctm.f || ctm.e);
     svg.remove();
   }
-  return events.map(function(e) {
+  var i = -1,
+      n = events.length,
+      points = [];
+  while (++i < n) {
+    var e = events[i];
     if (d3_mouse_bug44083) {
       point.x = e.pageX;
       point.y = e.pageY;
@@ -26,6 +30,7 @@ function d3_svg_mousePoints(container, events) {
       point.y = e.clientY;
     }
     point = point.matrixTransform(container.getScreenCTM().inverse());
-    return [point.x, point.y];
-  });
+    points.push([point.x, point.y]);
+  }
+  return points;
 };
diff --git a/src/svg/touches.js b/src/svg/touches.js
@@ -1,5 +1,5 @@
 d3.svg.touches = function(container) {
   var touches = d3.event.touches;
   return touches && touches.length
-    ? d3_svg_mousePoints(container, d3_array(touches)) : [];
+    ? d3_svg_mousePoints(container, touches) : [];
 };