transition.remove() fix

transition.remove() ought to work even when a delayed transition
was preempted by the current transition.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.5.5",
+  "version": "3.5.6-kiln",
   "main": "d3.js",
   "scripts": [
     "d3.js"

component.json

@@ -10,7 +10,7 @@
     "animation",
     "canvas"
   ],
-  "version": "3.5.5",
+  "version": "3.5.6-kiln",
   "main": "d3.js",
   "scripts": [
     "d3.js"

d3.js

@@ -1,6 +1,6 @@
 !function() {
   var d3 = {
-    version: "3.5.5"
+    version: "3.5.6-kiln"
   };
   var d3_arraySlice = [].slice, d3_array = function(list) {
     return d3_arraySlice.call(list);
@@ -8790,8 +8790,14 @@
   d3_transitionPrototype.remove = function() {
     var ns = this.namespace;
     return this.each("end.transition", function() {
+      var lock = this[ns];
       var p;
-      if (this[ns].count < 2 && (p = this.parentNode)) p.removeChild(this);
+      if (lock.count > 1) {
+        for (var n in lock) {
+          if (n.match(/^\d+$/) && parseInt(n) > lock.active) return;
+        }
+      }
+      if (p = this.parentNode) p.removeChild(this);
     });
   };
   d3_transitionPrototype.ease = function(value) {

package.js

@@ -3,7 +3,7 @@
 Package.describe({
   name: "d3js:d3", // http://atmospherejs.com/d3js/d3
   summary: "D3 (official): A JavaScript visualization library for HTML and SVG.",
-  version: "3.5.5",
+  version: "3.5.6-kiln",
   git: "https://github.com/mbostock/d3.git"
 });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.5.5",
+  "version": "3.5.6-kiln",
   "description": "A JavaScript visualization library for HTML and SVG.",
   "keywords": [
     "dom",

src/start.js

@@ -1,2 +1,2 @@
 !function(){
-  var d3 = {version: "3.5.5"}; // semver
+  var d3 = {version: "3.5.6-kiln"}; // semver

src/transition/remove.js

@@ -3,7 +3,13 @@ import "transition";
 d3_transitionPrototype.remove = function() {
   var ns = this.namespace;
   return this.each("end.transition", function() {
+    var lock = this[ns];
     var p;
-    if (this[ns].count < 2 && (p = this.parentNode)) p.removeChild(this);
+    if (lock.count > 1) {
+        for (var n in lock) {
+            if (n.match(/^\d+$/) && parseInt(n) > lock.active) return;
+        }
+    }
+    if (p = this.parentNode) p.removeChild(this);
   });
 };

test/transition/transition-test-remove.js

@@ -53,5 +53,20 @@ module.exports = {
     "does nothing": function(selection) {
       assert.equal(selection[0][0].parentNode.tagName, "BODY");
     }
+  },
+
+  "when a delayed transition has been preempted": {
+    "topic": function(d3) {
+      var callback = this.callback,
+          s = d3.select("body").append("div");
+      s.transition().delay(1000);
+      s.transition().duration(50).remove();
+      setTimeout(function() {
+        callback(null, s)
+      }, 100);
+    },
+    "the element is still removed": function(selection) {
+      assert.domEqual(selection[0][0].parentNode, null);
+    }
   }
 };