JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 5 additions & 2 deletions b/‎d3.js‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎d3.min.js‎
Lines changed: 1 addition & 1 deletion b/‎d3.min.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/layout/hierarchy.js‎
Lines changed: 5 additions & 2 deletions b/‎src/layout/hierarchy.js‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎test/layout/hierarchy-test.js‎
Lines changed: 6 additions & 0 deletions b/‎test/layout/hierarchy-test.js‎
Lines changed: 6 additions & 0 deletions
@@ -6118,8 +6118,11 @@ d3 = function() {
         }
         if (sort) c.sort(sort);
         if (value) node.value = v;
-      } else if (value) {
-        node.value = +value.call(hierarchy, node, depth) || 0;
+      } else {
+        delete node.children;
+        if (value) {
+          node.value = +value.call(hierarchy, node, depth) || 0;
+        }
       }
       return node;
     }
 
@@ -28,8 +28,11 @@ d3.layout.hierarchy = function() {
       }
       if (sort) c.sort(sort);
       if (value) node.value = v;
-    } else if (value) {
-      node.value = +value.call(hierarchy, node, depth) || 0;
+    } else {
+      delete node.children;
+      if (value) {
+        node.value = +value.call(hierarchy, node, depth) || 0;
+      }
     }
     return node;
   }
 
@@ -20,6 +20,12 @@ suite.addBatch({
       assert.equal(nodes[0].value, 0);
       h.nodes(nodes[0]);
       assert.equal(nodes[0].value, 0);
+    },
+    "removes the children array for a node that has no children": function(hierarchy) {
+      var h = hierarchy(),
+          nodes = h.children(function() { return null; }).nodes({children: [{}]});
+      assert.equal(nodes[0].value, 0);
+      assert.isUndefined(nodes[0].children);
     }
   }
 });
Original file line number	Diff line number	Diff line change
`@@ -6118,8 +6118,11 @@ d3 = function() {`
`6118`	`6118`	`}`
`6119`	`6119`	`if (sort) c.sort(sort);`
`6120`	`6120`	`if (value) node.value = v;`
`6121`		`- } else if (value) {`
`6122`		`- node.value = +value.call(hierarchy, node, depth) \|\| 0;`
	`6121`	`+ } else {`
	`6122`	`+ delete node.children;`
	`6123`	`+ if (value) {`
	`6124`	`+ node.value = +value.call(hierarchy, node, depth) \|\| 0;`
	`6125`	`+ }`
`6123`	`6126`	`}`
`6124`	`6127`	`return node;`
`6125`	`6128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,11 @@ d3.layout.hierarchy = function() {`
`28`	`28`	`}`
`29`	`29`	`if (sort) c.sort(sort);`
`30`	`30`	`if (value) node.value = v;`
`31`		`- } else if (value) {`
`32`		`- node.value = +value.call(hierarchy, node, depth) \|\| 0;`
	`31`	`+ } else {`
	`32`	`+ delete node.children;`
	`33`	`+ if (value) {`
	`34`	`+ node.value = +value.call(hierarchy, node, depth) \|\| 0;`
	`35`	`+ }`
`33`	`36`	`}`
`34`	`37`	`return node;`
`35`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,12 @@ suite.addBatch({`
`20`	`20`	`assert.equal(nodes[0].value, 0);`
`21`	`21`	`h.nodes(nodes[0]);`
`22`	`22`	`assert.equal(nodes[0].value, 0);`
	`23`	`+ },`
	`24`	`+ "removes the children array for a node that has no children": function(hierarchy) {`
	`25`	`+ var h = hierarchy(),`
	`26`	`+ nodes = h.children(function() { return null; }).nodes({children: [{}]});`
	`27`	`+ assert.equal(nodes[0].value, 0);`
	`28`	`+ assert.isUndefined(nodes[0].children);`
`23`	`29`	`}`
`24`	`30`	`}`
`25`	`31`	`});`