--- a/cms/app-client/app/components/visu-langues.js Wed Jan 20 23:05:52 2016 +0100
+++ b/cms/app-client/app/components/visu-langues.js Wed Jan 20 23:51:55 2016 +0100
@@ -64,9 +64,7 @@
// We also take a snapshot of the original children (_children) to avoid
// the children being overwritten when when layout is computed.
function accumulate(d) {
- return (d._children = d.children)
- ? d.value = d.children.reduce(function(p, v) { return p + accumulate(v); }, 0)
- : d.value;
+ return (d._children = d.children) ? d.value = d.children.reduce(function(p, v) { return p + accumulate(v); }, 0) : d.value;
}
// Compute the treemap layout recursively such that each group of siblings
@@ -105,18 +103,12 @@
.data(d._children)
.enter().append("g");
- g.classed("bla", true).on("click", selectHandler)
+ g.classed("bla", true).on("click", selectHandler);
g.filter(function(d) { return d._children; })
.classed("children", true)
.on("click", transition);
- // g.selectAll(".child")
- // .data(function(d) { return d._children || [d]; })
- // .enter().append("rect")
- // .attr("class", "child")
- // .call(rect);
-
g.append("rect")
.attr("class", "parent")
// .attr("fill", (d.color || "#bbb"))
@@ -130,7 +122,7 @@
.call(text);
function transition(d) {
- if (transitioning || !d) return;
+ if (transitioning || !d) { return; }
selectHandler(d);
transitioning = true;
@@ -174,12 +166,12 @@
return g;
}
- function text(text) {
+ function text() {
text.attr("x", function(d) { return x(d.x) + 6; })
.attr("y", function(d) { return y(d.y) + 6; });
}
- function rect(rect) {
+ function rect() {
rect.attr("x", function(d) { return x(d.x); })
.attr("y", function(d) { return y(d.y); })
.attr("width", function(d) { return x(d.x + d.dx) - x(d.x); })
@@ -188,9 +180,7 @@
}
function name(d) {
- return d.parent
- ? name(d.parent) + "." + d.name
- : d.name;
+ return d.parent ? name(d.parent) + "." + d.name : d.name;
}
});
}