Merge remote-tracking branch 'origin/enter-size' into 3.4.12

mbostock · mbostock · commit 2d83168df39e · 2014-10-08T07:45:27.000-07:00
diff --git a/d3.js b/d3.js
@@ -911,7 +911,7 @@
   };
   d3_selectionPrototype.size = function() {
     var n = 0;
-    this.each(function() {
+    d3_selection_each(this, function() {
       ++n;
     });
     return n;
diff --git a/d3.min.js b/d3.min.js
diff --git a/src/selection/size.js b/src/selection/size.js
@@ -1,7 +1,7 @@
-import "selection";
+import "each";
 
 d3_selectionPrototype.size = function() {
   var n = 0;
-  this.each(function() { ++n; });
+  d3_selection_each(this, function() { ++n; });
   return n;
 };
diff --git a/test/selection/enter-test.js b/test/selection/enter-test.js
@@ -17,6 +17,10 @@ suite.addBatch({
       var selection = enter.foo();
       assert.equal(d3.select("body").html(), "<foo></foo><foo></foo>");
       delete d3.selection.enter.prototype.foo;
+    },
+    "size": function(d3) {
+      var enter = d3.select("body").selectAll("div").data([0, 1]).enter();
+      assert.equal(enter.size(), 2);
     }
   }
 });

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@ suite.addBatch({`
`17`	`17`	`var selection = enter.foo();`
`18`	`18`	`assert.equal(d3.select("body").html(), "<foo></foo><foo></foo>");`
`19`	`19`	`delete d3.selection.enter.prototype.foo;`
	`20`	`+ },`
	`21`	`+ "size": function(d3) {`
	`22`	`+ var enter = d3.select("body").selectAll("div").data([0, 1]).enter();`
	`23`	`+ assert.equal(enter.size(), 2);`
`20`	`24`	`}`
`21`	`25`	`}`
`22`	`26`	`});`