Merge remote-tracking branch 'origin/transition-gc' into 3.5

mbostock · mbostock · commit 2db7e92b2049 · 2014-11-14T12:44:07.000-08:00
diff --git a/d3.js b/d3.js
@@ -8576,9 +8576,13 @@
       subgroups.push(subgroup = []);
       for (var group = this[j], i = 0, n = group.length; i < n; i++) {
         if (node = group[i]) {
-          transition = Object.create(node.__transition__[id0]);
-          transition.delay += transition.duration;
-          d3_transitionNode(node, i, id1, transition);
+          transition = node.__transition__[id0];
+          d3_transitionNode(node, i, id1, {
+            time: transition.time,
+            ease: transition.ease,
+            delay: transition.delay + transition.duration,
+            duration: transition.duration
+          });
         }
         subgroup.push(node);
       }
@@ -8599,6 +8603,7 @@
         delay: inherit.delay,
         duration: inherit.duration
       };
+      inherit = null;
       ++lock.count;
       d3.timer(function(elapsed) {
         var d = node.__data__, ease = transition.ease, delay = transition.delay, duration = transition.duration, timer = d3_timer_active, tweened = [];
diff --git a/d3.min.js b/d3.min.js
diff --git a/src/transition/subtransition.js b/src/transition/subtransition.js
@@ -13,9 +13,8 @@ d3_transitionPrototype.transition = function() {
     subgroups.push(subgroup = []);
     for (var group = this[j], i = 0, n = group.length; i < n; i++) {
       if (node = group[i]) {
-        transition = Object.create(node.__transition__[id0]);
-        transition.delay += transition.duration;
-        d3_transitionNode(node, i, id1, transition);
+        transition = node.__transition__[id0];
+        d3_transitionNode(node, i, id1, {time: transition.time, ease: transition.ease, delay: transition.delay + transition.duration, duration: transition.duration});
       }
       subgroup.push(node);
     }
diff --git a/src/transition/transition.js b/src/transition/transition.js
@@ -60,6 +60,8 @@ function d3_transitionNode(node, i, id, inherit) {
       duration: inherit.duration
     };
 
+    inherit = null; // allow gc
+
     ++lock.count;
 
     d3.timer(function(elapsed) {

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@ d3_transitionPrototype.transition = function() {`
`13`	`13`	`subgroups.push(subgroup = []);`
`14`	`14`	`for (var group = this[j], i = 0, n = group.length; i < n; i++) {`
`15`	`15`	`if (node = group[i]) {`
`16`		`- transition = Object.create(node.__transition__[id0]);`
`17`		`- transition.delay += transition.duration;`
`18`		`- d3_transitionNode(node, i, id1, transition);`
	`16`	`+ transition = node.__transition__[id0];`
	`17`	`+ d3_transitionNode(node, i, id1, {time: transition.time, ease: transition.ease, delay: transition.delay + transition.duration, duration: transition.duration});`
`19`	`18`	`}`
`20`	`19`	`subgroup.push(node);`
`21`	`20`	`}`