JavaScriptCollection
diff --git a/‎Makefile‎
Lines changed: 1 addition & 0 deletions b/‎Makefile‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎d3.js‎
Lines changed: 64 additions & 14 deletions b/‎d3.js‎
Lines changed: 64 additions & 14 deletions
@@ -29,6 +29,7 @@ SRC_FILES = \
 	src/selectAll.js \
 	src/selection.js \
 	src/transition.js \
+	src/timer.js \
 	src/tween.js \
 	src/end.js
 
 
@@ -1205,27 +1205,18 @@ d3.transition = function() {
 };
 
 // TODO namespace transitions; cancel collisions
-// TODO easing
 function d3_transition(groups) {
   var transition = {},
       tweens = {},
-      timeout = setTimeout(start, 1),
-      interval,
-      then = Date.now(),
       event = d3.dispatch("start", "end"),
       stage = [],
       delay = [],
       duration = [],
       durationMax,
       ease = d3.ease("cubic-in-out");
 
-  function start() {
-    interval = setInterval(step, 24);
-  }
-
-  function step() {
-    var elapsed = Date.now() - then,
-        clear = true,
+  function step(elapsed) {
+    var clear = true,
         k = -1;
     groups.each(function(d, i) {
       if (stage[++k] == 2) return; // ended
@@ -1247,7 +1238,7 @@ function d3_transition(groups) {
         event.end.dispatch.apply(this, arguments);
       }
     });
-    if (clear) clearInterval(interval);
+    return clear;
   }
 
   transition.delay = function(value) {
@@ -1264,8 +1255,7 @@ function d3_transition(groups) {
         delay[++k] = delayMin;
       });
     }
-    clearTimeout(timeout);
-    timeout = setTimeout(start, delayMin);
+    d3_timer(step, delayMin);
     return transition;
   };
 
@@ -1366,6 +1356,66 @@ function d3_transition(groups) {
 
   return transition.delay(0).duration(250);
 }
+var d3_timer_queue = null,
+    d3_timer_timeout = 0,
+    d3_timer_interval;
+
+function d3_timer(callback, delay) {
+  var now = Date.now(),
+      found = false,
+      start = now + delay,
+      t0,
+      t1 = d3_timer_queue;
+
+  // Scan the queue for earliest callback.
+  while (t1) {
+    if (t1.callback == callback) {
+      t1.then = now;
+      t1.delay = delay;
+      found = true;
+    } else {
+      var x = t1.then + t1.delay;
+      if (x < start) start = x;
+    }
+    t0 = t1;
+    t1 = t1.next;
+  }
+
+  // Otherwise, add the callback to the queue.
+  if (!found) d3_timer_queue = {
+    callback: callback,
+    then: now,
+    delay: delay,
+    next: d3_timer_queue
+  };
+
+  if (!d3_timer_interval) {
+    clearTimeout(d3_timer_timeout);
+    d3_timer_timeout = setTimeout(d3_timer_start, Math.min(24, start - now));
+  }
+}
+
+function d3_timer_start() {
+  d3_timer_interval = setInterval(d3_timer_step, 24);
+  d3_timer_timeout = 0;
+}
+
+function d3_timer_step() {
+  var elapsed,
+      now = Date.now(),
+      t0 = null,
+      t1 = d3_timer_queue;
+  while (t1) {
+    elapsed = now - t1.then;
+    if ((elapsed > t1.delay) && t1.callback(elapsed)) {
+      if (t0) t0.next = t1.next;
+      else d3_timer_queue = t1.next;
+    }
+    t0 = t1;
+    t1 = t1.next;
+  }
+  if (!t0) d3_timer_interval = clearInterval(d3_timer_interval);
+}
 function d3_tween(b) {
   return typeof b == "function"
     ? function(d, i, a) { return d3.interpolate(a, b.call(this, d, i)); }