Fix selection.interrupt.

mbostock · mbostock · commit 4e4709ce47d5 · 2014-12-30T09:03:54.000-08:00
Even if no further transitions are scheduled on the element, we must still advance the active counter to interrupt the active transition. Fixes d3#2165. Also added better tests that verify interruption.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "main": "d3.js",
   "scripts": [
     "d3.js"
diff --git a/component.json b/component.json
@@ -10,7 +10,7 @@
     "animation",
     "canvas"
   ],
-  "version": "3.5.2",
+  "version": "3.5.3",
   "main": "d3.js",
   "scripts": [
     "d3.js"
diff --git a/d3.js b/d3.js
@@ -1,6 +1,6 @@
 !function() {
   var d3 = {
-    version: "3.5.2"
+    version: "3.5.3"
   };
   if (!Date.now) Date.now = function() {
     return +new Date();
@@ -8575,12 +8575,8 @@
     return function() {
       var lock, active;
       if ((lock = this[ns]) && (active = lock[lock.active])) {
-        if (--lock.count) {
-          delete lock[lock.active];
-          lock.active += .5;
-        } else {
-          delete this[ns];
-        }
+        if (--lock.count) delete lock[lock.active]; else delete this[ns];
+        lock.active += .5;
         active.event && active.event.interrupt.call(this, this.__data__, active.index);
       }
     };
diff --git a/d3.min.js b/d3.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "A JavaScript visualization library for HTML and SVG.",
   "keywords": [
     "dom",
diff --git a/src/selection/interrupt.js b/src/selection/interrupt.js
@@ -14,12 +14,9 @@ function d3_selection_interruptNS(ns) {
   return function() {
     var lock, active;
     if ((lock = this[ns]) && (active = lock[lock.active])) {
-      if (--lock.count) {
-        delete lock[lock.active];
-        lock.active += .5;
-      } else {
-        delete this[ns];
-      }
+      if (--lock.count) delete lock[lock.active];
+      else delete this[ns];
+      lock.active += .5;
       active.event && active.event.interrupt.call(this, this.__data__, active.index);
     }
   };
diff --git a/src/start.js b/src/start.js
@@ -1,2 +1,2 @@
 !function(){
-  var d3 = {version: "3.5.2"}; // semver
+  var d3 = {version: "3.5.3"}; // semver
diff --git a/test/selection/interrupt-test.js b/test/selection/interrupt-test.js
@@ -13,12 +13,50 @@ suite.addBatch({
     },
     "interrupts the active transition": function(d3) {
       var selection = d3.select("body").append("div"),
-          transition = selection.transition();
-      assert.equal(selection.node().__transition__.active, 0); // transition hasn’t yet started
+          transition = selection.transition(),
+          lock = selection.node().__transition__;
+      assert.equal(lock.active, 0); // transition hasn’t yet started
       d3.timer.flush();
-      assert.equal(selection.node().__transition__.active, transition.id); // transition has started
+      assert.equal(lock.active, transition.id); // transition has started
       selection.interrupt();
-      assert.isUndefined(selection.node().__transition__); // transition was interrupted
+      assert.greater(lock.active, transition.id); // transition was interrupted
+      assert.lesser(lock.active, transition.id + 1); // future transitions not interrupted
+      assert.isUndefined(selection.node().__transition__); // transition was cleared
+    },
+    "the interrupted transition’s tweens do not receive any further calls": function(d3) {
+      var selection = d3.select("body").append("div"),
+          ticks = 0,
+          transition = selection.transition().tween("test", function() { return function() { ++ticks; }; });
+      d3.timer.flush();
+      var ticks0 = ticks;
+      assert.greater(ticks0, 0);
+      d3.timer.flush();
+      var ticks1 = ticks;
+      assert.greater(ticks, ticks0);
+      selection.interrupt();
+      d3.timer.flush();
+      assert.equal(ticks, ticks1);
+    },
+    "the interrupted transition does not emit an end event": {
+      topic: function(d3) {
+        var callback = this.callback,
+            selection = d3.select("body").append("div");
+
+        selection.transition()
+            .duration(250)
+            .each("end", function() { callback(null, "fail"); });
+
+        setTimeout(function() {
+          selection.interrupt();
+        }, 100);
+
+        setTimeout(function() {
+          callback(null, "success");
+        }, 750);
+      },
+      "": function(result) {
+        assert.equal(result, "success");
+      }
     },
     "does not prevent a future scheduled transition": function(d3) {
       var selection = d3.select("body").append("div"),

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "d3",`
`3`		`- "version": "3.5.2",`
	`3`	`+ "version": "3.5.3",`
`4`	`4`	`"main": "d3.js",`
`5`	`5`	`"scripts": [`
`6`	`6`	`"d3.js"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`!function(){`
`2`		`- var d3 = {version: "3.5.2"}; // semver`
	`2`	`+ var d3 = {version: "3.5.3"}; // semver`