Merge branch '3.1.5'

component.json

@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "main": "index-browserify.js",
   "scripts": [
     "index-browserify.js",

d3.js

@@ -1,6 +1,6 @@
 d3 = function() {
   var d3 = {
-    version: "3.1.4"
+    version: "3.1.5"
   };
   if (!Date.now) Date.now = function() {
     return +new Date();
@@ -409,6 +409,16 @@ d3 = function() {
     while (s = e.sourceEvent) e = s;
     return e;
   }
+  function d3_eventSuppress(target, type) {
+    function off() {
+      target.on(type, null);
+    }
+    target.on(type, function() {
+      d3_eventCancel();
+      off();
+    }, true);
+    setTimeout(off, 0);
+  }
   function d3_eventDispatch(target) {
     var dispatch = new d3_dispatch(), i = 0, n = arguments.length;
     while (++i < n) dispatch[arguments[i]] = d3_dispatch_event(dispatch);
@@ -524,14 +534,10 @@ d3 = function() {
         });
         if (moved) {
           d3_eventCancel();
-          if (d3.event.target === eventTarget) w.on("click.drag", click, true);
+          if (d3.event.target === eventTarget) d3_eventSuppress(w, "click");
         }
         w.on(touchId != null ? "touchmove.drag-" + touchId : "mousemove.drag", null).on(touchId != null ? "touchend.drag-" + touchId : "mouseup.drag", null);
       }
-      function click() {
-        d3_eventCancel();
-        w.on("click.drag", null);
-      }
     }
     drag.origin = function(x) {
       if (!arguments.length) return origin;
@@ -1171,11 +1177,7 @@ d3 = function() {
       function mouseup() {
         if (moved) d3_eventCancel();
         w.on("mousemove.zoom", null).on("mouseup.zoom", null);
-        if (moved && d3.event.target === eventTarget) w.on("click.zoom", click, true);
-      }
-      function click() {
-        d3_eventCancel();
-        w.on("click.zoom", null);
+        if (moved && d3.event.target === eventTarget) d3_eventSuppress(w, "click.zoom");
       }
     }
     function mousewheel() {
@@ -2002,14 +2004,14 @@ d3 = function() {
   }
   d3.geo = {};
   d3.geo.stream = function(object, listener) {
-    if (d3_geo_streamObjectType.hasOwnProperty(object.type)) {
+    if (object && d3_geo_streamObjectType.hasOwnProperty(object.type)) {
       d3_geo_streamObjectType[object.type](object, listener);
     } else {
       d3_geo_streamGeometry(object, listener);
     }
   };
   function d3_geo_streamGeometry(geometry, listener) {
-    if (d3_geo_streamGeometryType.hasOwnProperty(geometry.type)) {
+    if (geometry && d3_geo_streamGeometryType.hasOwnProperty(geometry.type)) {
       d3_geo_streamGeometryType[geometry.type](geometry, listener);
     }
   }
@@ -4683,7 +4685,7 @@ d3 = function() {
   };
   d3.interpolateNumber = d3_interpolateNumber;
   function d3_interpolateNumber(a, b) {
-    b -= a;
+    b -= a = +a;
     return function(t) {
       return a + b * t;
     };
@@ -4764,6 +4766,7 @@ d3 = function() {
   d3.interpolateString = d3_interpolateString;
   function d3_interpolateString(a, b) {
     var m, i, j, s0 = 0, s1 = 0, s = [], q = [], n, o;
+    a = a + "", b = b + "";
     d3_interpolate_number.lastIndex = 0;
     for (i = 0; m = d3_interpolate_number.exec(b); ++i) {
       if (m.index) s.push(b.substring(s0, s1 = m.index));
@@ -4834,14 +4837,9 @@ d3 = function() {
   function d3_interpolateByName(name) {
     return name == "transform" ? d3_interpolateTransform : d3_interpolate;
   }
-  d3.interpolators = [ d3_interpolateObject, function(a, b) {
-    return Array.isArray(b) && d3_interpolateArray(a, b);
-  }, function(a, b) {
-    return (typeof a === "string" || typeof b === "string") && d3_interpolateString(a + "", b + "");
-  }, function(a, b) {
-    return (typeof b === "string" ? d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Color) && d3_interpolateRgb(a, b);
-  }, function(a, b) {
-    return !isNaN(a = +a) && !isNaN(b = +b) && d3_interpolateNumber(a, b);
+  d3.interpolators = [ function(a, b) {
+    var t = typeof b;
+    return (t === "string" || t !== typeof a ? d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) ? d3_interpolateRgb : d3_interpolateString : b instanceof d3_Color ? d3_interpolateRgb : t === "object" ? Array.isArray(b) ? d3_interpolateArray : d3_interpolateObject : d3_interpolateNumber)(a, b);
   } ];
   d3.interpolateArray = d3_interpolateArray;
   function d3_interpolateArray(a, b) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",

src/behavior/drag.js

@@ -65,18 +65,12 @@ d3.behavior.drag = function() {
       // if moved, prevent the mouseup (and possibly click) from propagating
       if (moved) {
         d3_eventCancel();
-        if (d3.event.target === eventTarget) w.on("click.drag", click, true);
+        if (d3.event.target === eventTarget) d3_eventSuppress(w, "click");
       }
 
       w .on(touchId != null ? "touchmove.drag-" + touchId : "mousemove.drag", null)
         .on(touchId != null ? "touchend.drag-" + touchId : "mouseup.drag", null);
     }
-
-    // prevent the subsequent click from propagating (e.g., for anchors)
-    function click() {
-      d3_eventCancel();
-      w.on("click.drag", null);
-    }
   }
 
   drag.origin = function(x) {

src/behavior/zoom.js

@@ -116,12 +116,7 @@ d3.behavior.zoom = function() {
     function mouseup() {
       if (moved) d3_eventCancel();
       w.on("mousemove.zoom", null).on("mouseup.zoom", null);
-      if (moved && d3.event.target === eventTarget) w.on("click.zoom", click, true);
-    }
-
-    function click() {
-      d3_eventCancel();
-      w.on("click.zoom", null);
+      if (moved && d3.event.target === eventTarget) d3_eventSuppress(w, "click.zoom");
     }
   }
 

src/event/event.js

@@ -13,6 +13,15 @@ function d3_eventSource() {
   return e;
 }
 
+// Registers an event listener for the specified target that cancels the next
+// event for the specified type, but only if it occurs immediately. This is
+// useful to disambiguate dragging from clicking.
+function d3_eventSuppress(target, type) {
+  function off() { target.on(type, null); }
+  target.on(type, function() { d3_eventCancel(); off(); }, true);
+  setTimeout(off, 0); // clear the handler if it doesn't fire
+}
+
 // Like d3.dispatch, but for custom events abstracting native UI events. These
 // events have a target component (such as a brush), a target element (such as
 // the svg:g element containing the brush) and the standard arguments `d` (the

src/geo/stream.js

@@ -1,15 +1,15 @@
 import "geo";
 
 d3.geo.stream = function(object, listener) {
-  if (d3_geo_streamObjectType.hasOwnProperty(object.type)) {
+  if (object && d3_geo_streamObjectType.hasOwnProperty(object.type)) {
     d3_geo_streamObjectType[object.type](object, listener);
   } else {
     d3_geo_streamGeometry(object, listener);
   }
 };
 
 function d3_geo_streamGeometry(geometry, listener) {
-  if (d3_geo_streamGeometryType.hasOwnProperty(geometry.type)) {
+  if (geometry && d3_geo_streamGeometryType.hasOwnProperty(geometry.type)) {
     d3_geo_streamGeometryType[geometry.type](geometry, listener);
   }
 }

src/interpolate/interpolate.js

@@ -22,9 +22,11 @@ function d3_interpolateByName(name) {
 }
 
 d3.interpolators = [
-  d3_interpolateObject,
-  function(a, b) { return Array.isArray(b) && d3_interpolateArray(a, b); },
-  function(a, b) { return (typeof a === "string" || typeof b === "string") && d3_interpolateString(a + "", b + ""); },
-  function(a, b) { return (typeof b === "string" ? d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Color) && d3_interpolateRgb(a, b); },
-  function(a, b) { return !isNaN(a = +a) && !isNaN(b = +b) && d3_interpolateNumber(a, b); }
+  function(a, b) {
+    var t = typeof b;
+    return (t === "string" || t !== typeof a ? (d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) ? d3_interpolateRgb : d3_interpolateString)
+        : b instanceof d3_Color ? d3_interpolateRgb
+        : t === "object" ? (Array.isArray(b) ? d3_interpolateArray : d3_interpolateObject)
+        : d3_interpolateNumber)(a, b);
+  }
 ];

src/interpolate/number.js

@@ -1,6 +1,6 @@
 d3.interpolateNumber = d3_interpolateNumber;
 
 function d3_interpolateNumber(a, b) {
-  b -= a;
+  b -= a = +a;
   return function(t) { return a + b * t; };
 }

src/interpolate/string.js

@@ -13,6 +13,9 @@ function d3_interpolateString(a, b) {
       n, // q.length
       o;
 
+  // Coerce inputs to strings.
+  a = a + "", b = b + "";
+
   // Reset our regular expression!
   d3_interpolate_number.lastIndex = 0;
 

src/start.js

@@ -1,2 +1,2 @@
 d3 = (function(){
-  var d3 = {version: "3.1.4"}; // semver
+  var d3 = {version: "3.1.5"}; // semver

test/assert.js

@@ -2,6 +2,12 @@ var assert = require("assert");
 
 assert = module.exports = Object.create(assert);
 
+assert.isArray = function(actual, message) {
+  if (!Array.isArray(actual)) {
+    assert.fail(actual, null, message || "expected {actual} to be an Array", null, assert.isArray);
+  }
+};
+
 assert.inDelta = function(actual, expected, delta, message) {
   if (!inDelta(actual, expected, delta)) {
     assert.fail(actual, expected, message || "expected {actual} to be in within *" + delta + "* of {expected}", null, assert.inDelta);

test/geo/stream-test.js

@@ -19,6 +19,12 @@ suite.addBatch({
       stream({type: "FeatureCollection", features: [{type: "Feature", geometry: {type: "Unknown"}}]}, {});
       stream({type: "GeometryCollection", geometries: [{type: "Unknown"}]}, {});
     },
+    "ignores null geometries": function(stream) {
+      stream(null, {});
+      stream({type: "Feature", geometry: null}, {});
+      stream({type: "FeatureCollection", features: [{type: "Feature", geometry: null}]}, {});
+      stream({type: "GeometryCollection", geometries: [null]}, {});
+    },
     "returns void": function(stream) {
       assert.isUndefined(stream({type: "Point", coordinates: [1, 2]}, {point: function() { return true; }}));
     },

test/interpolate/ease-test.js

@@ -49,37 +49,37 @@ suite.addBatch({
     },
     "invalid eases and modes default to linear-in": function(ease) {
       var e = ease("__proto__-__proto__");
-      assert.equal(e(0), 0);
-      assert.equal(e(.5), .5);
-      assert.equal(e(1), 1);
+      assert.strictEqual(e(0), 0);
+      assert.strictEqual(e(.5), .5);
+      assert.strictEqual(e(1), 1);
       var e = ease("hasOwnProperty-constructor");
-      assert.equal(e(0), 0);
-      assert.equal(e(.5), .5);
-      assert.equal(e(1), 1);
+      assert.strictEqual(e(0), 0);
+      assert.strictEqual(e(.5), .5);
+      assert.strictEqual(e(1), 1);
     },
     "all easing functions return exactly 0 for t = 0": function(ease) {
-      assert.equal(ease("linear")(0), 0);
-      assert.equal(ease("poly", 2)(0), 0);
-      assert.equal(ease("quad")(0), 0);
-      assert.equal(ease("cubic")(0), 0);
-      assert.equal(ease("sin")(0), 0);
-      assert.equal(ease("exp")(0), 0);
-      assert.equal(ease("circle")(0), 0);
-      assert.equal(ease("elastic")(0), 0);
-      assert.equal(ease("back")(0), 0);
-      assert.equal(ease("bounce")(0), 0);
+      assert.strictEqual(ease("linear")(0), 0);
+      assert.strictEqual(ease("poly", 2)(0), 0);
+      assert.strictEqual(ease("quad")(0), 0);
+      assert.strictEqual(ease("cubic")(0), 0);
+      assert.strictEqual(ease("sin")(0), 0);
+      assert.strictEqual(ease("exp")(0), 0);
+      assert.strictEqual(ease("circle")(0), 0);
+      assert.strictEqual(ease("elastic")(0), 0);
+      assert.strictEqual(ease("back")(0), 0);
+      assert.strictEqual(ease("bounce")(0), 0);
     },
     "all easing functions return exactly 1 for t = 1": function(ease) {
-      assert.equal(ease("linear")(1), 1);
-      assert.equal(ease("poly", 2)(1), 1);
-      assert.equal(ease("quad")(1), 1);
-      assert.equal(ease("cubic")(1), 1);
-      assert.equal(ease("sin")(1), 1);
-      assert.equal(ease("exp")(1), 1);
-      assert.equal(ease("circle")(1), 1);
-      assert.equal(ease("elastic")(1), 1);
-      assert.equal(ease("back")(1), 1);
-      assert.equal(ease("bounce")(1), 1);
+      assert.strictEqual(ease("linear")(1), 1);
+      assert.strictEqual(ease("poly", 2)(1), 1);
+      assert.strictEqual(ease("quad")(1), 1);
+      assert.strictEqual(ease("cubic")(1), 1);
+      assert.strictEqual(ease("sin")(1), 1);
+      assert.strictEqual(ease("exp")(1), 1);
+      assert.strictEqual(ease("circle")(1), 1);
+      assert.strictEqual(ease("elastic")(1), 1);
+      assert.strictEqual(ease("back")(1), 1);
+      assert.strictEqual(ease("bounce")(1), 1);
     },
     "the -in suffix returns the identity": function(ease) {
       assert.inDelta(ease("linear-in")(.25), ease("linear")(.25), 1e-6);

test/interpolate/hsl-test.js

@@ -8,22 +8,22 @@ suite.addBatch({
   "interpolateHsl": {
     topic: load("interpolate/hsl"), // beware instanceof d3_Color
     "parses string input": function(d3) {
-      assert.equal(d3.interpolateHsl("steelblue", "#f00")(.2), "#383dc3");
-      assert.equal(d3.interpolateHsl("steelblue", "#f00")(.6), "#dd1ce1");
+      assert.strictEqual(d3.interpolateHsl("steelblue", "#f00")(.2), "#383dc3");
+      assert.strictEqual(d3.interpolateHsl("steelblue", "#f00")(.6), "#dd1ce1");
     },
     "parses d3.hsl input": function(d3) {
-      assert.equal(d3.interpolateHsl(d3.hsl("steelblue"), "#f00")(.2), "#383dc3");
-      assert.equal(d3.interpolateHsl("steelblue", d3.hsl(0, 1, .5))(.6), "#dd1ce1");
+      assert.strictEqual(d3.interpolateHsl(d3.hsl("steelblue"), "#f00")(.2), "#383dc3");
+      assert.strictEqual(d3.interpolateHsl("steelblue", d3.hsl(0, 1, .5))(.6), "#dd1ce1");
     },
     "parses d3.rgb input": function(d3) {
-      assert.equal(d3.interpolateHsl(d3.rgb("steelblue"), "#f00")(.2), "#383dc3");
-      assert.equal(d3.interpolateHsl("steelblue", d3.rgb(255, 0, 0))(.6), "#dd1ce1");
+      assert.strictEqual(d3.interpolateHsl(d3.rgb("steelblue"), "#f00")(.2), "#383dc3");
+      assert.strictEqual(d3.interpolateHsl("steelblue", d3.rgb(255, 0, 0))(.6), "#dd1ce1");
     },
     "interpolates in HSL color space": function(d3) {
-      assert.equal(d3.interpolateHsl("steelblue", "#f00")(.2), "#383dc3");
+      assert.strictEqual(d3.interpolateHsl("steelblue", "#f00")(.2), "#383dc3");
     },
     "outputs a hexadecimal string": function(d3) {
-      assert.equal(d3.interpolateHsl("steelblue", "#f00")(.2), "#383dc3");
+      assert.strictEqual(d3.interpolateHsl("steelblue", "#f00")(.2), "#383dc3");
     }
   }
 });