Assume fixed orientation.

d3 · May 31, 2016 · e1d90ce · e1d90ce
1 parent dfa2dc0
commit e1d90ce
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/axis.js b/src/axis.js
@@ -59,11 +59,15 @@ function axis(orient, scale) {
 
     line = line.merge(tickEnter.append("line")
         .attr("stroke", "#000")
-        .attr(x + "2", k * tickSizeInner));
+        .attr(x + "2", k * tickSizeInner)
+        .attr(y + "1", 0.5)
+        .attr(y + "2", 0.5));
 
     text = text.merge(tickEnter.append("text")
         .attr("fill", "#000")
-        .attr(x, k * spacing));
+        .attr(x, k * spacing)
+        .attr(y, 0.5)
+        .attr("dy", orient === top ? "0em" : orient === bottom ? ".71em" : ".32em"));
 
     if (context !== selection) {
       path = path.transition(context);
@@ -92,21 +96,20 @@ function axis(orient, scale) {
         .attr("transform", function(d) { return transform(position, position, d); });
 
     line
-        .attr(x + "2", k * tickSizeInner)
-        .attr(y + "1", 0.5)
-        .attr(y + "2", 0.5);
+        .attr(x + "2", k * tickSizeInner);
 
     text
         .attr(x, k * spacing)
-        .attr(y, 0.5)
-        .attr("dy", orient === top ? "0em" : orient === bottom ? ".71em" : ".32em")
         .text(format);
 
     selection
+      .filter(function() { return !this.__axis; })
         .attr("fill", "none")
         .attr("font-size", 10)
         .attr("font-family", "sans-serif")
-        .attr("text-anchor", orient === right ? "start" : orient === left ? "end" : "middle")
+        .attr("text-anchor", orient === right ? "start" : orient === left ? "end" : "middle");
+
+    selection
         .each(function() { this.__axis = position; });
   }