Remove code duplication for label rotation similar to axes flipping.

syntagmatic · Nov 28, 2014 · 8b11e73 · 8b11e73
1 parent 69903b9
commit 8b11e73
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 40 deletions.
diff --git a/d3.parcoords.js b/d3.parcoords.js
@@ -498,6 +498,17 @@ function flipAxisAndUpdatePCP(dimension, i) {
   if (flags.shadows) paths(__.data, ctx.shadows);
 }
 
+function rotateLabels() {
+  var delta = d3.event.wheelDeltaY;
+  delta = delta < 0 ? -5 : delta;
+  delta = delta > 0 ? 5 : delta;
+
+  __.dimensionTitleRotation += delta;
+  pc.svg.selectAll("text.label")
+    .attr("transform", "translate(0,-5) rotate(" + __.dimensionTitleRotation + ")");
+  d3.event.preventDefault();
+}
+
 pc.createAxes = function() {
   if (g) pc.removeAxes();
 
@@ -525,16 +536,7 @@ pc.createAxes = function() {
         return d in __.dimensionTitles ? __.dimensionTitles[d] : d;  // dimension display names
       })
       .on("dblclick", flipAxisAndUpdatePCP)
-      .on("wheel", function(d) {
-        var delta = d3.event.wheelDeltaY;
-        delta = delta < 0 ? -5 : delta;
-        delta = delta > 0 ? 5 : delta;
-
-        __.dimensionTitleRotation += delta;
-        pc.svg.selectAll("text.label")
-          .attr("transform", "translate(0,-5) rotate(" + __.dimensionTitleRotation + ")");
-        d3.event.preventDefault();
-      });
+      .on("wheel", rotateLabels);
 
   flags.axes= true;
   return this;
@@ -567,16 +569,7 @@ pc.updateAxes = function() {
       })
       .text(String)
       .on("dblclick", flipAxisAndUpdatePCP)
-      .on("wheel", function(d) {
-        var delta = d3.event.wheelDeltaY;
-        delta = delta < 0 ? -5 : delta;
-        delta = delta > 0 ? 5 : delta;
-
-        __.dimensionTitleRotation += delta;
-        pc.svg.selectAll("text.label")
-          .attr("transform", "translate(0,-5) rotate(" + __.dimensionTitleRotation + ")");
-        d3.event.preventDefault();
-      });
+      .on("wheel", rotateLabels);
 
   // Update
   g_data.attr("opacity", 0);

diff --git a/src/axis.js b/src/axis.js
@@ -11,6 +11,17 @@ function flipAxisAndUpdatePCP(dimension, i) {
   if (flags.shadows) paths(__.data, ctx.shadows);
 }
 
+function rotateLabels() {
+  var delta = d3.event.wheelDeltaY;
+  delta = delta < 0 ? -5 : delta;
+  delta = delta > 0 ? 5 : delta;
+
+  __.dimensionTitleRotation += delta;
+  pc.svg.selectAll("text.label")
+    .attr("transform", "translate(0,-5) rotate(" + __.dimensionTitleRotation + ")");
+  d3.event.preventDefault();
+}
+
 pc.createAxes = function() {
   if (g) pc.removeAxes();
 
@@ -38,16 +49,7 @@ pc.createAxes = function() {
         return d in __.dimensionTitles ? __.dimensionTitles[d] : d;  // dimension display names
       })
       .on("dblclick", flipAxisAndUpdatePCP)
-      .on("wheel", function(d) {
-        var delta = d3.event.wheelDeltaY;
-        delta = delta < 0 ? -5 : delta;
-        delta = delta > 0 ? 5 : delta;
-
-        __.dimensionTitleRotation += delta;
-        pc.svg.selectAll("text.label")
-          .attr("transform", "translate(0,-5) rotate(" + __.dimensionTitleRotation + ")");
-        d3.event.preventDefault();
-      });
+      .on("wheel", rotateLabels);
 
   flags.axes= true;
   return this;
@@ -80,16 +82,7 @@ pc.updateAxes = function() {
       })
       .text(String)
       .on("dblclick", flipAxisAndUpdatePCP)
-      .on("wheel", function(d) {
-        var delta = d3.event.wheelDeltaY;
-        delta = delta < 0 ? -5 : delta;
-        delta = delta > 0 ? 5 : delta;
-
-        __.dimensionTitleRotation += delta;
-        pc.svg.selectAll("text.label")
-          .attr("transform", "translate(0,-5) rotate(" + __.dimensionTitleRotation + ")");
-        d3.event.preventDefault();
-      });
+      .on("wheel", rotateLabels);
 
   // Update
   g_data.attr("opacity", 0);