Merge branch 'fix-dispatch'

loganlinn · Nov 22, 2011 · 2df8c62 · 2df8c62
2 parents 5d57fa7 + 1b3a3b3
commit 2df8c62
Show file tree

Hide file tree

Showing 19 changed files with 127 additions and 133 deletions.
diff --git a/d3.js b/d3.js
@@ -10,7 +10,7 @@ try {
     d3_style_setProperty.call(this, name, value + "", priority);
   };
 }
-d3 = {version: "2.5.1"}; // semver
+d3 = {version: "2.5.2"}; // semver
 var d3_array = d3_arraySlice; // conversion for NodeLists
 
 function d3_arrayCopy(pseudoarray) {
@@ -46,13 +46,22 @@ function d3_this() {
 d3.functor = function(v) {
   return typeof v === "function" ? v : function() { return v; };
 };
-// A getter-setter method that preserves the appropriate `this` context.
-d3.rebind = function(object, method) {
+// Copies a variable number of methods from source to target.
+d3.rebind = function(target, source) {
+  var i = 1, n = arguments.length, method;
+  while (++i < n) target[method = arguments[i]] = d3_rebind(target, source, source[method]);
+  return target;
+};
+
+// Method is assumed to be a standard D3 getter-setter:
+// If passed with no arguments, gets the value.
+// If passed with arguments, sets the value and returns the target.
+function d3_rebind(target, source, method) {
   return function() {
-    var x = method.apply(object, arguments);
-    return arguments.length ? object : x;
+    var value = method.apply(source, arguments);
+    return arguments.length ? target : value;
   };
-};
+}
 d3.ascending = function(a, b) {
   return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
 };
@@ -494,7 +503,9 @@ d3_dispatch.prototype.on = function(type, listener) {
     type = type.substring(0, i);
   }
 
-  this[type].on(name, listener);
+  return arguments.length < 2
+      ? this[type].on(name)
+      : (this[type].on(name, listener), this);
 };
 
 function d3_dispatch_event() {
@@ -506,24 +517,25 @@ function d3_dispatch_event() {
         i = -1,
         n = z.length,
         l;
-    while (++i < n) if ((l = z[i])._on) l.apply(this, arguments);
+    while (++i < n) if (l = z[i].on) l.apply(this, arguments);
   }
 
   dispatch.on = function(name, listener) {
     var l, i;
 
-    // remove the old listener, if any
+    // return the current listener, if any
+    if (arguments.length < 2) return (l = listenerByName[name]) && l.on;
+
+    // remove the old listener, if any (with copy-on-write)
     if (l = listenerByName[name]) {
-      l._on = false;
+      l.on = null;
       listeners = listeners.slice(0, i = listeners.indexOf(l)).concat(listeners.slice(i + 1));
       delete listenerByName[name];
     }
 
     // add the new listener, if any
     if (listener) {
-      listener._on = true;
-      listeners.push(listener);
-      listenerByName[name] = listener;
+      listeners.push(listenerByName[name] = {on: listener});
     }
 
     return dispatch;
@@ -2411,11 +2423,7 @@ function d3_scale_linear(domain, range, interpolate, clamp) {
 };
 
 function d3_scale_linearRebind(scale, linear) {
-  scale.range = d3.rebind(scale, linear.range);
-  scale.rangeRound = d3.rebind(scale, linear.rangeRound);
-  scale.interpolate = d3.rebind(scale, linear.interpolate);
-  scale.clamp = d3.rebind(scale, linear.clamp);
-  return scale;
+  return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
 }
 
 function d3_scale_linearNice(dx) {
@@ -4109,18 +4117,13 @@ d3.svg.brush = function() {
         || (y && extent[0][1] === extent[1][1]);
   };
 
-  brush.on = function(type, listener) {
-    event.on(type, listener);
-    return brush;
-  };
-
   d3.select(window)
       .on("mousemove.brush", d3_svg_brushMove)
       .on("mouseup.brush", d3_svg_brushUp)
       .on("keydown.brush", d3_svg_brushKeydown)
       .on("keyup.brush", d3_svg_brushKeyup);
 
-  return brush;
+  return d3.rebind(brush, event, "on");
 };
 
 var d3_svg_brush,
@@ -4305,12 +4308,7 @@ d3.behavior.drag = function() {
     d3_behavior_dragDispatch("dragstart");
   }
 
-  drag.on = function(type, listener) {
-    event.on(type, listener);
-    return drag;
-  };
-
-  return drag;
+  return d3.rebind(drag, event, "on");
 };
 
 var d3_behavior_dragEvent,
@@ -4450,12 +4448,7 @@ d3.behavior.zoom = function() {
     return zoom;
   };
 
-  zoom.on = function(type, listener) {
-    event.on(type, listener);
-    return zoom;
-  };
-
-  return zoom;
+  return d3.rebind(zoom, event, "on");
 };
 
 var d3_behavior_zoomDiv,

diff --git a/d3.layout.js b/d3.layout.js
@@ -324,11 +324,6 @@ d3.layout.force = function() {
     return (alpha *= .99) < .005;
   }
 
-  force.on = function(type, listener) {
-    event.on(type, listener);
-    return force;
-  };
-
   force.nodes = function(x) {
     if (!arguments.length) return nodes;
     nodes = x;
@@ -489,7 +484,7 @@ d3.layout.force = function() {
     d3_layout_forceDragForce = force;
   }
 
-  return force;
+  return d3.rebind(force, event, "on");
 };
 
 var d3_layout_forceDragForce,
@@ -1120,10 +1115,10 @@ d3.layout.hierarchy = function() {
 
 // A method assignment helper for hierarchy subclasses.
 function d3_layout_hierarchyRebind(object, hierarchy) {
-  object.sort = d3.rebind(object, hierarchy.sort);
-  object.children = d3.rebind(object, hierarchy.children);
+  d3.rebind(object, hierarchy, "sort", "children", "value");
+
+  // Add an alias for links, for convenience.
   object.links = d3_layout_hierarchyLinks;
-  object.value = d3.rebind(object, hierarchy.value);
 
   // If the new API is used, enabling inlining.
   object.nodes = function(d) {

diff --git a/d3.layout.min.js b/d3.layout.min.js
diff --git a/d3.min.js b/d3.min.js
diff --git a/d3.time.js b/d3.time.js
@@ -570,12 +570,7 @@ function d3_time_scale(linear, methods, format) {
   };
 
   // TOOD expose d3_scale_linear_rebind?
-  scale.range = d3.rebind(scale, linear.range);
-  scale.rangeRound = d3.rebind(scale, linear.rangeRound);
-  scale.interpolate = d3.rebind(scale, linear.interpolate);
-  scale.clamp = d3.rebind(scale, linear.clamp);
-
-  return scale;
+  return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
 }
 
 // TODO expose d3_scaleExtent?

diff --git a/d3.time.min.js b/d3.time.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",

diff --git a/src/behavior/drag.js b/src/behavior/drag.js
@@ -28,12 +28,7 @@ d3.behavior.drag = function() {
     d3_behavior_dragDispatch("dragstart");
   }
 
-  drag.on = function(type, listener) {
-    event.on(type, listener);
-    return drag;
-  };
-
-  return drag;
+  return d3.rebind(drag, event, "on");
 };
 
 var d3_behavior_dragEvent,

diff --git a/src/behavior/zoom.js b/src/behavior/zoom.js
@@ -69,12 +69,7 @@ d3.behavior.zoom = function() {
     return zoom;
   };
 
-  zoom.on = function(type, listener) {
-    event.on(type, listener);
-    return zoom;
-  };
-
-  return zoom;
+  return d3.rebind(zoom, event, "on");
 };
 
 var d3_behavior_zoomDiv,

diff --git a/src/core/core.js b/src/core/core.js
@@ -1 +1 @@
-d3 = {version: "2.5.1"}; // semver
+d3 = {version: "2.5.2"}; // semver
diff --git a/src/core/dispatch.js b/src/core/dispatch.js
@@ -18,7 +18,9 @@ d3_dispatch.prototype.on = function(type, listener) {
     type = type.substring(0, i);
   }
 
-  this[type].on(name, listener);
+  return arguments.length < 2
+      ? this[type].on(name)
+      : (this[type].on(name, listener), this);
 };
 
 function d3_dispatch_event() {
@@ -30,24 +32,25 @@ function d3_dispatch_event() {
         i = -1,
         n = z.length,
         l;
-    while (++i < n) if ((l = z[i])._on) l.apply(this, arguments);
+    while (++i < n) if (l = z[i].on) l.apply(this, arguments);
   }
 
   dispatch.on = function(name, listener) {
     var l, i;
 
-    // remove the old listener, if any
+    // return the current listener, if any
+    if (arguments.length < 2) return (l = listenerByName[name]) && l.on;
+
+    // remove the old listener, if any (with copy-on-write)
     if (l = listenerByName[name]) {
-      l._on = false;
+      l.on = null;
       listeners = listeners.slice(0, i = listeners.indexOf(l)).concat(listeners.slice(i + 1));
       delete listenerByName[name];
     }
 
     // add the new listener, if any
     if (listener) {
-      listener._on = true;
-      listeners.push(listener);
-      listenerByName[name] = listener;
+      listeners.push(listenerByName[name] = {on: listener});
     }
 
     return dispatch;

diff --git a/src/core/rebind.js b/src/core/rebind.js
@@ -1,7 +1,16 @@
-// A getter-setter method that preserves the appropriate `this` context.
-d3.rebind = function(object, method) {
+// Copies a variable number of methods from source to target.
+d3.rebind = function(target, source) {
+  var i = 1, n = arguments.length, method;
+  while (++i < n) target[method = arguments[i]] = d3_rebind(target, source, source[method]);
+  return target;
+};
+
+// Method is assumed to be a standard D3 getter-setter:
+// If passed with no arguments, gets the value.
+// If passed with arguments, sets the value and returns the target.
+function d3_rebind(target, source, method) {
   return function() {
-    var x = method.apply(object, arguments);
-    return arguments.length ? object : x;
+    var value = method.apply(source, arguments);
+    return arguments.length ? target : value;
   };
-};
+}
diff --git a/src/layout/force.js b/src/layout/force.js
@@ -113,11 +113,6 @@ d3.layout.force = function() {
     return (alpha *= .99) < .005;
   }
 
-  force.on = function(type, listener) {
-    event.on(type, listener);
-    return force;
-  };
-
   force.nodes = function(x) {
     if (!arguments.length) return nodes;
     nodes = x;
@@ -278,7 +273,7 @@ d3.layout.force = function() {
     d3_layout_forceDragForce = force;
   }
 
-  return force;
+  return d3.rebind(force, event, "on");
 };
 
 var d3_layout_forceDragForce,

diff --git a/src/layout/hierarchy.js b/src/layout/hierarchy.js
@@ -81,10 +81,10 @@ d3.layout.hierarchy = function() {
 
 // A method assignment helper for hierarchy subclasses.
 function d3_layout_hierarchyRebind(object, hierarchy) {
-  object.sort = d3.rebind(object, hierarchy.sort);
-  object.children = d3.rebind(object, hierarchy.children);
+  d3.rebind(object, hierarchy, "sort", "children", "value");
+
+  // Add an alias for links, for convenience.
   object.links = d3_layout_hierarchyLinks;
-  object.value = d3.rebind(object, hierarchy.value);
 
   // If the new API is used, enabling inlining.
   object.nodes = function(d) {

diff --git a/src/scale/linear.js b/src/scale/linear.js
@@ -72,11 +72,7 @@ function d3_scale_linear(domain, range, interpolate, clamp) {
 };
 
 function d3_scale_linearRebind(scale, linear) {
-  scale.range = d3.rebind(scale, linear.range);
-  scale.rangeRound = d3.rebind(scale, linear.rangeRound);
-  scale.interpolate = d3.rebind(scale, linear.interpolate);
-  scale.clamp = d3.rebind(scale, linear.clamp);
-  return scale;
+  return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
 }
 
 function d3_scale_linearNice(dx) {

diff --git a/src/svg/brush.js b/src/svg/brush.js
@@ -168,18 +168,13 @@ d3.svg.brush = function() {
         || (y && extent[0][1] === extent[1][1]);
   };
 
-  brush.on = function(type, listener) {
-    event.on(type, listener);
-    return brush;
-  };
-
   d3.select(window)
       .on("mousemove.brush", d3_svg_brushMove)
       .on("mouseup.brush", d3_svg_brushUp)
       .on("keydown.brush", d3_svg_brushKeydown)
       .on("keyup.brush", d3_svg_brushKeyup);
 
-  return brush;
+  return d3.rebind(brush, event, "on");
 };
 
 var d3_svg_brush,

diff --git a/src/time/scale.js b/src/time/scale.js
@@ -38,12 +38,7 @@ function d3_time_scale(linear, methods, format) {
   };
 
   // TOOD expose d3_scale_linear_rebind?
-  scale.range = d3.rebind(scale, linear.range);
-  scale.rangeRound = d3.rebind(scale, linear.rangeRound);
-  scale.interpolate = d3.rebind(scale, linear.interpolate);
-  scale.clamp = d3.rebind(scale, linear.clamp);
-
-  return scale;
+  return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
 }
 
 // TODO expose d3_scaleExtent?
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d3 = {version: "2.5.1"}; // semver
		d3 = {version: "2.5.2"}; // semver