Merge branch '3.2'

Author: mbostock

Makefile

@@ -33,7 +33,7 @@ d3.min.js: d3.js
 	@rm -f $@
 	bin/uglify $< > $@
 
-component.json: bin/component d3.js package.json
+component.json: bin/component package.json
 	@rm -f $@
 	bin/component > $@
 	@chmod a-w $@

component.json

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

d3.js

@@ -0,0 +1,23 @@
+This license applies to GeographicLib, versions 1.12 and later.
+
+Copyright (c) 2008-2012, Charles Karney
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

d3.min.js

@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.1.10",
+  "version": "3.2.0",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "smash": "~0.0.8",
-    "uglify-js": "git://github.com/mishoo/UglifyJS2.git#3bd7ca9961125b39dcd54d2182cb72bd1ca6006e",
+    "uglify-js": "2.3.6",
     "vows": "0.7.x"
   },
   "scripts": {

lib/geographiclib/LICENSE

@@ -3,6 +3,7 @@ import "../core/rebind";
 import "../event/event";
 import "../event/mouse";
 import "../event/touches";
+import "../event/user-select";
 import "behavior";
 
 d3.behavior.drag = function() {
@@ -21,7 +22,8 @@ d3.behavior.drag = function() {
         touchId = d3.event.touches ? d3.event.changedTouches[0].identifier : null,
         offset,
         origin_ = point(),
-        moved = 0;
+        moved = 0,
+        selectEnable = d3_event_userSelectSuppress(touchId != null ? "drag-" + touchId : "drag");
 
     var w = d3.select(d3_window)
         .on(touchId != null ? "touchmove.drag-" + touchId : "mousemove.drag", dragmove)
@@ -34,8 +36,6 @@ d3.behavior.drag = function() {
       offset = [0, 0];
     }
 
-    // Only cancel mousedown; touchstart is needed for draggable links.
-    if (touchId == null) d3_eventCancel();
     event_({type: "dragstart"});
 
     function point() {
@@ -70,6 +70,7 @@ d3.behavior.drag = function() {
 
       w .on(touchId != null ? "touchmove.drag-" + touchId : "mousemove.drag", null)
         .on(touchId != null ? "touchend.drag-" + touchId : "mouseup.drag", null);
+      selectEnable();
     }
   }
 

package.json

@@ -3,6 +3,7 @@ import "../core/rebind";
 import "../event/event";
 import "../event/mouse";
 import "../event/touches";
+import "../event/user-select";
 import "../selection/selection";
 import "behavior";
 
@@ -102,10 +103,8 @@ d3.behavior.zoom = function() {
         eventTarget = d3.event.target,
         moved = 0,
         w = d3.select(d3_window).on("mousemove.zoom", mousemove).on("mouseup.zoom", mouseup),
-        l = location(d3.mouse(target));
-
-    d3_window.focus();
-    d3_eventCancel();
+        l = location(d3.mouse(target)),
+        selectEnable = d3_event_userSelectSuppress("zoom");
 
     function mousemove() {
       moved = 1;
@@ -116,6 +115,7 @@ d3.behavior.zoom = function() {
     function mouseup() {
       if (moved) d3_eventCancel();
       w.on("mousemove.zoom", null).on("mouseup.zoom", null);
+      selectEnable();
       if (moved && d3.event.target === eventTarget) d3_eventSuppress(w, "click.zoom");
     }
   }
@@ -145,7 +145,6 @@ d3.behavior.zoom = function() {
     scale0 = scale;
     translate0 = {};
     touches.forEach(function(t) { translate0[t.identifier] = location(t); });
-    d3_eventCancel();
 
     if (touches.length === 1) {
       if (now - touchtime < 500) { // dbltap

src/behavior/drag.js

@@ -13,7 +13,7 @@ function d3_arraySlice(pseudoarray) {
 }
 
 try {
-  d3_array(d3_document.documentElement.childNodes)[0].nodeType;
+  d3_array(d3_documentElement.childNodes)[0].nodeType;
 } catch(e) {
   d3_array = d3_arrayCopy;
 }

src/behavior/zoom.js

@@ -1,2 +1,3 @@
 var d3_document = document,
+    d3_documentElement = d3_document.documentElement,
     d3_window = window;

src/core/array.js

@@ -0,0 +1,12 @@
+import "document";
+
+function d3_vendorSymbol(object, name) {
+  if (name in object) return name;
+  name = name.charAt(0).toUpperCase() + name.substring(1);
+  for (var i = 0, n = d3_vendorPrefixes.length; i < n; ++i) {
+    var prefixName = d3_vendorPrefixes[i] + name;
+    if (prefixName in object) return prefixName;
+  }
+}
+
+var d3_vendorPrefixes = ["webkit", "ms", "moz", "Moz", "o", "O"];

src/core/document.js

@@ -1,3 +1,3 @@
 import "dsv";
 
-d3.csv = d3_dsv(",", "text/csv");
+d3.csv = d3.dsv(",", "text/csv");

src/core/vendor.js

@@ -1,7 +1,7 @@
 import "../arrays/set";
 import "../xhr/xhr";
 
-function d3_dsv(delimiter, mimeType) {
+d3.dsv = function(delimiter, mimeType) {
   var reFormat = new RegExp("[\"" + delimiter + "\n]"),
       delimiterCode = delimiter.charCodeAt(0);
 
@@ -133,4 +133,4 @@ function d3_dsv(delimiter, mimeType) {
   }
 
   return dsv;
-}
+};

src/dsv/csv.js

@@ -1,3 +1,3 @@
 import "dsv";
 
-d3.tsv = d3_dsv("\t", "text/tab-separated-values");
+d3.tsv = d3.dsv("\t", "text/tab-separated-values");

src/dsv/dsv.js

@@ -12,10 +12,14 @@ function d3_mousePoint(container, e) {
   if (svg.createSVGPoint) {
     var point = svg.createSVGPoint();
     if (d3_mouse_bug44083 < 0 && (d3_window.scrollX || d3_window.scrollY)) {
-      svg = d3.select(d3_document.body).append("svg")
-          .style("position", "absolute")
-          .style("top", 0)
-          .style("left", 0);
+      svg = d3.select("body").append("svg").style({
+        position: "absolute",
+        top: 0,
+        left: 0,
+        margin: 0,
+        padding: 0,
+        border: "none"
+      }, "important");
       var ctm = svg[0][0].getScreenCTM();
       d3_mouse_bug44083 = !(ctm.f || ctm.e);
       svg.remove();

src/dsv/tsv.js

@@ -1,4 +1,5 @@
 import "../core/document";
+import "../core/vendor";
 
 var d3_timer_queueHead,
     d3_timer_queueTail,
@@ -77,9 +78,5 @@ function d3_timer_sweep() {
   return time;
 }
 
-var d3_timer_frame = d3_window.requestAnimationFrame
-    || d3_window.webkitRequestAnimationFrame
-    || d3_window.mozRequestAnimationFrame
-    || d3_window.oRequestAnimationFrame
-    || d3_window.msRequestAnimationFrame
+var d3_timer_frame = d3_window[d3_vendorSymbol(d3_window, "requestAnimationFrame")]
     || function(callback) { setTimeout(callback, 17); };

src/event/mouse.js

@@ -0,0 +1,16 @@
+import "../core/document";
+import "../core/vendor";
+import "event";
+
+var d3_event_userSelectProperty = d3_vendorSymbol(d3_documentElement.style, "userSelect"),
+    d3_event_userSelectSuppress = d3_event_userSelectProperty
+      ? function() {
+          var style = d3_documentElement.style,
+              select = style[d3_event_userSelectProperty];
+          style[d3_event_userSelectProperty] = "none";
+          return function() { style[d3_event_userSelectProperty] = select; };
+        }
+      : function(type) {
+          var w = d3.select(d3_window).on("selectstart." + type, d3_eventCancel);
+          return function() { w.on("selectstart." + type, null); };
+        };

src/event/timer.js

@@ -1,4 +1,5 @@
 import "../core/noop";
+import "../math/adder";
 import "../math/trigonometry";
 import "geo";
 import "stream";
@@ -10,7 +11,7 @@ d3.geo.area = function(object) {
 };
 
 var d3_geo_areaSum,
-    d3_geo_areaRingSum;
+    d3_geo_areaRingSum = new d3_adder;
 
 var d3_geo_area = {
   sphere: function() { d3_geo_areaSum += 4 * π; },
@@ -20,7 +21,7 @@ var d3_geo_area = {
 
   // Only count area for polygon rings.
   polygonStart: function() {
-    d3_geo_areaRingSum = 0;
+    d3_geo_areaRingSum.reset();
     d3_geo_area.lineStart = d3_geo_areaRingStart;
   },
   polygonEnd: function() {
@@ -31,7 +32,7 @@ var d3_geo_area = {
 };
 
 function d3_geo_areaRingStart() {
-  var λ00, φ00, λ0, cosφ0, sinφ0; // start point and two previous points
+  var λ00, φ00, λ0, cosφ0, sinφ0; // start point and previous point
 
   // For the first point, …
   d3_geo_area.point = function(λ, φ) {
@@ -53,7 +54,7 @@ function d3_geo_areaRingStart() {
         k = sinφ0 * sinφ,
         u = cosφ0 * cosφ + k * Math.cos(dλ),
         v = k * Math.sin(dλ);
-    d3_geo_areaRingSum += Math.atan2(v, u);
+    d3_geo_areaRingSum.add(Math.atan2(v, u));
 
     // Advance the previous points.
     λ0 = λ, cosφ0 = cosφ, sinφ0 = sinφ;

src/event/user-select.js

@@ -136,29 +136,34 @@ d3.geo.bounds = (function() {
 
     d3.geo.stream(feature, bound);
 
-    // First, sort ranges by their minimum longitudes.
-    ranges.sort(compareRanges);
-
-    // Then, merge any ranges that overlap.
-    for (var i = 1, n = ranges.length, a = ranges[0], b, merged = [a]; i < n; ++i) {
-      b = ranges[i];
-      if (withinRange(b[0], a) || withinRange(b[1], a)) {
-        if (angle(a[0], b[1]) > angle(a[0], a[1])) a[1] = b[1];
-        if (angle(b[0], a[1]) > angle(a[0], a[1])) a[0] = b[0];
-      } else {
-        merged.push(a = b);
+    var n = ranges.length;
+    if (n) {
+      // First, sort ranges by their minimum longitudes.
+      ranges.sort(compareRanges);
+
+      // Then, merge any ranges that overlap.
+      for (var i = 1, a = ranges[0], b, merged = [a]; i < n; ++i) {
+        b = ranges[i];
+        if (withinRange(b[0], a) || withinRange(b[1], a)) {
+          if (angle(a[0], b[1]) > angle(a[0], a[1])) a[1] = b[1];
+          if (angle(b[0], a[1]) > angle(a[0], a[1])) a[0] = b[0];
+        } else {
+          merged.push(a = b);
+        }
       }
-    }
 
-    // Finally, find the largest gap between the merged ranges.
-    // The final bounding box will be the inverse of this gap.
-    var best = -Infinity, dλ;
-    for (var n = merged.length - 1, i = 0, a = merged[n], b; i <= n; a = b, ++i) {
-      b = merged[i];
-      if ((dλ = angle(a[1], b[0])) > best) best = dλ, λ0 = b[0], λ1 = a[1];
+      // Finally, find the largest gap between the merged ranges.
+      // The final bounding box will be the inverse of this gap.
+      var best = -Infinity, dλ;
+      for (var n = merged.length - 1, i = 0, a = merged[n], b; i <= n; a = b, ++i) {
+        b = merged[i];
+        if ((dλ = angle(a[1], b[0])) > best) best = dλ, λ0 = b[0], λ1 = a[1];
+      }
     }
     ranges = range = null;
 
-    return [[λ0, φ0], [λ1, φ1]];
+    return λ0 === Infinity || φ0 === Infinity
+        ? [[NaN, NaN], [NaN, NaN]]
+        : [[λ0, φ0], [λ1, φ1]];
   };
 })();