small update to allow the line label to have its own distinct classna…

…me by default.
heavysixer · Jul 23, 2014 · a7f7702 · a7f7702
1 parent fba9b5e
commit a7f7702
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/d4.js b/d4.js
@@ -3206,8 +3206,8 @@
           }.bind(this));
         },
 
-        pointLabelText: function(d) {
-          var str = this.x.$key + ': ' + d[this.x.$key];
+        pointLabelText: function(d, datum) {
+          var str = datum.key + ' ' + this.x.$key + ': ' + d[this.x.$key];
           str += ' ' + this.y.$key + ': ' + d[this.y.$key];
           return str;
         },
@@ -3221,7 +3221,7 @@
           label
             .style('display', null)
             .attr('transform', 'translate(5,' + offset + ')')
-            .text(d4.functor(this.features[name].accessors.pointLabelText).bind(this)(d));
+            .text(d4.functor(this.features[name].accessors.pointLabelText).bind(this)(d, datum));
         },
 
         showDataPoint: function(d, datum) {
@@ -3255,7 +3255,9 @@
           .attr('x', d4.functor(scope.accessors.x).bind(this))
           .attr('y', d4.functor(scope.accessors.y).bind(this))
           .attr('data-key', d4.functor(scope.accessors.key).bind(this))
-          .attr('class', d4.functor(scope.accessors.classes).bind(this));
+          .attr('class', function(d, n) {
+            return d4.functor(scope.accessors.classes).bind(this)(d, n) + ' seriesLabel';
+          }.bind(this));
         displayXValue.bind(this)(scope, data, selection);
 
         return label;

diff --git a/d4.min.js b/d4.min.js
diff --git a/src/features/line-series-labels.js b/src/features/line-series-labels.js
@@ -105,8 +105,8 @@
           }.bind(this));
         },
 
-        pointLabelText: function(d) {
-          var str = this.x.$key + ': ' + d[this.x.$key];
+        pointLabelText: function(d, datum) {
+          var str = datum.key + ' ' + this.x.$key + ': ' + d[this.x.$key];
           str += ' ' + this.y.$key + ': ' + d[this.y.$key];
           return str;
         },
@@ -120,7 +120,7 @@
           label
             .style('display', null)
             .attr('transform', 'translate(5,' + offset + ')')
-            .text(d4.functor(this.features[name].accessors.pointLabelText).bind(this)(d));
+            .text(d4.functor(this.features[name].accessors.pointLabelText).bind(this)(d, datum));
         },
 
         showDataPoint: function(d, datum) {
@@ -154,7 +154,9 @@
           .attr('x', d4.functor(scope.accessors.x).bind(this))
           .attr('y', d4.functor(scope.accessors.y).bind(this))
           .attr('data-key', d4.functor(scope.accessors.key).bind(this))
-          .attr('class', d4.functor(scope.accessors.classes).bind(this));
+          .attr('class', function(d, n) {
+            return d4.functor(scope.accessors.classes).bind(this)(d, n) + ' seriesLabel';
+          }.bind(this));
         displayXValue.bind(this)(scope, data, selection);
 
         return label;

diff --git a/test/lib/d4.js b/test/lib/d4.js
@@ -3206,8 +3206,8 @@
           }.bind(this));
         },
 
-        pointLabelText: function(d) {
-          var str = this.x.$key + ': ' + d[this.x.$key];
+        pointLabelText: function(d, datum) {
+          var str = datum.key + ' ' + this.x.$key + ': ' + d[this.x.$key];
           str += ' ' + this.y.$key + ': ' + d[this.y.$key];
           return str;
         },
@@ -3221,7 +3221,7 @@
           label
             .style('display', null)
             .attr('transform', 'translate(5,' + offset + ')')
-            .text(d4.functor(this.features[name].accessors.pointLabelText).bind(this)(d));
+            .text(d4.functor(this.features[name].accessors.pointLabelText).bind(this)(d, datum));
         },
 
         showDataPoint: function(d, datum) {
@@ -3255,7 +3255,9 @@
           .attr('x', d4.functor(scope.accessors.x).bind(this))
           .attr('y', d4.functor(scope.accessors.y).bind(this))
           .attr('data-key', d4.functor(scope.accessors.key).bind(this))
-          .attr('class', d4.functor(scope.accessors.classes).bind(this));
+          .attr('class', function(d, n) {
+            return d4.functor(scope.accessors.classes).bind(this)(d, n) + ' seriesLabel';
+          }.bind(this));
         displayXValue.bind(this)(scope, data, selection);
 
         return label;