Merge branch 'fix-hierarchy-revalue'

mbostock · mbostock · commit db8d30584d97 · 2014-05-19T11:25:57.000-07:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.4.7",
+  "version": "3.4.8",
   "main": "d3.js",
   "scripts": [
     "d3.js"
diff --git a/component.json b/component.json
@@ -10,7 +10,7 @@
     "animation",
     "canvas"
   ],
-  "version": "3.4.7",
+  "version": "3.4.8",
   "main": "d3.js",
   "scripts": [
     "d3.js"
diff --git a/d3.js b/d3.js
@@ -1,6 +1,6 @@
 !function() {
   var d3 = {
-    version: "3.4.7"
+    version: "3.4.8"
   };
   if (!Date.now) Date.now = function() {
     return +new Date();
@@ -6377,11 +6377,16 @@
       return hierarchy;
     };
     hierarchy.revalue = function(root) {
-      if (value) d3_layout_hierarchyVisitAfter(root, function(node) {
-        var parent;
-        node.value = node.children ? 0 : +value.call(hierarchy, node, node.depth) || 0;
-        if (parent = node.parent) parent.value += node.value;
-      });
+      if (value) {
+        d3_layout_hierarchyVisitBefore(root, function(node) {
+          if (node.children) node.value = 0;
+        });
+        d3_layout_hierarchyVisitAfter(root, function(node) {
+          var parent;
+          if (!node.children) node.value = +value.call(hierarchy, node, node.depth) || 0;
+          if (parent = node.parent) parent.value += node.value;
+        });
+      }
       return root;
     };
     return hierarchy;
diff --git a/d3.min.js b/d3.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.4.7",
+  "version": "3.4.8",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",
diff --git a/src/layout/hierarchy.js b/src/layout/hierarchy.js
@@ -60,11 +60,16 @@ d3.layout.hierarchy = function() {
 
   // Re-evaluates the `value` property for the specified hierarchy.
   hierarchy.revalue = function(root) {
-    if (value) d3_layout_hierarchyVisitAfter(root, function(node) {
-      var parent;
-      node.value = node.children ? 0 : +value.call(hierarchy, node, node.depth) || 0;
-      if (parent = node.parent) parent.value += node.value;
-    });
+    if (value) {
+      d3_layout_hierarchyVisitBefore(root, function(node) {
+        if (node.children) node.value = 0;
+      });
+      d3_layout_hierarchyVisitAfter(root, function(node) {
+        var parent;
+        if (!node.children) node.value = +value.call(hierarchy, node, node.depth) || 0;
+        if (parent = node.parent) parent.value += node.value;
+      });
+    }
     return root;
   };
 
diff --git a/src/start.js b/src/start.js
@@ -1,2 +1,2 @@
 !function(){
-  var d3 = {version: "3.4.7"}; // semver
+  var d3 = {version: "3.4.8"}; // semver
diff --git a/test/layout/hierarchy-test.js b/test/layout/hierarchy-test.js
@@ -26,6 +26,13 @@ suite.addBatch({
           nodes = h.children(function() { return null; }).nodes({children: [{}]});
       assert.equal(nodes[0].value, 0);
       assert.isUndefined(nodes[0].children);
+    },
+    "revalue": function(hierarchy) {
+      var h = hierarchy().sticky(true),
+          nodes = h.nodes({children: [{children: [{value: 1}, {value: 2}]}, {value: 3}]});
+      assert.equal(nodes[0].value, 6);
+      h(nodes[0]); // calls hierarchy.revalue
+      assert.equal(nodes[0].value, 6);
     }
   }
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "d3",`
`3`		`- "version": "3.4.7",`
	`3`	`+ "version": "3.4.8",`
`4`	`4`	`"main": "d3.js",`
`5`	`5`	`"scripts": [`
`6`	`6`	`"d3.js"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`!function(){`
`2`		`- var d3 = {version: "3.4.7"}; // semver`
	`2`	`+ var d3 = {version: "3.4.8"}; // semver`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,13 @@ suite.addBatch({`
`26`	`26`	`nodes = h.children(function() { return null; }).nodes({children: [{}]});`
`27`	`27`	`assert.equal(nodes[0].value, 0);`
`28`	`28`	`assert.isUndefined(nodes[0].children);`
	`29`	`+ },`
	`30`	`+ "revalue": function(hierarchy) {`
	`31`	`+ var h = hierarchy().sticky(true),`
	`32`	`+ nodes = h.nodes({children: [{children: [{value: 1}, {value: 2}]}, {value: 3}]});`
	`33`	`+ assert.equal(nodes[0].value, 6);`
	`34`	`+ h(nodes[0]); // calls hierarchy.revalue`
	`35`	`+ assert.equal(nodes[0].value, 6);`
`29`	`36`	`}`
`30`	`37`	`}`
`31`	`38`	`});`