Skip to content

Commit

Permalink
bundle this up into the previous release.
Browse files Browse the repository at this point in the history
  • Loading branch information
@heavysixer
heavysixer committed Aug 5, 2014
1 parent 4bcbac7 commit 5815928
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 19 deletions.
12 changes: 5 additions & 7 deletions d4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3108,9 +3108,7 @@
var point = this.svg.select('.' + name).selectAll('.' + name + ' circle.dataPoint').data(data);
point.enter().append('circle');
point.exit().remove();
point.attr('data-key', function(d) {
return d.key;
})
point.attr('data-key', d4.functor(scope.accessors.key).bind(this))
.style('display', 'none')
.attr('r', d4.functor(scope.accessors.r).bind(this)())
.attr('class', function(d, n) {
Expand Down Expand Up @@ -3192,7 +3190,7 @@
d4.functor(this.features[name].accessors.showDataPoint).bind(this)(d, datum, n);
d4.functor(this.features[name].accessors.showDataLabel).bind(this)(d, datum, n);
} else {
var selector = '.' + name + ' .dataPoint[data-key="' + datum.key + '"]';
var selector = '.' + name + ' .dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var point = this.svg.select(selector);
point
.style('display', 'none');
Expand All @@ -3209,7 +3207,7 @@
r: 4.5,

showDataLabel: function(d, datum, n) {
var pointLabelSelector = '.' + name + ' text.dataPoint[data-key="' + datum.key + '"]';
var pointLabelSelector = '.' + name + ' text.dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var label = this.svg.select(pointLabelSelector);
var offset = n * 20;
label
Expand All @@ -3218,8 +3216,8 @@
.text(d4.functor(this.features[name].accessors.pointLabelText).bind(this)(d, datum));
},

showDataPoint: function(d, datum) {
var pointSelector = '.' + name + ' circle.dataPoint[data-key="' + datum.key + '"]';
showDataPoint: function(d, datum, n) {
var pointSelector = '.' + name + ' circle.dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var point = this.svg.select(pointSelector);
point
.style('display', null)
Expand Down
4 changes: 2 additions & 2 deletions d4.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/features/line-series-labels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
d4.functor(this.features[name].accessors.showDataPoint).bind(this)(d, datum, n);
d4.functor(this.features[name].accessors.showDataLabel).bind(this)(d, datum, n);
} else {
var selector = '.' + name + ' .dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum,n) + '"]';
var selector = '.' + name + ' .dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var point = this.svg.select(selector);
point
.style('display', 'none');
Expand All @@ -110,7 +110,7 @@
r: 4.5,

showDataLabel: function(d, datum, n) {
var pointLabelSelector = '.' + name + ' text.dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum,n) + '"]';
var pointLabelSelector = '.' + name + ' text.dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var label = this.svg.select(pointLabelSelector);
var offset = n * 20;
label
Expand All @@ -120,7 +120,7 @@
},

showDataPoint: function(d, datum, n) {
var pointSelector = '.' + name + ' circle.dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum,n) + '"]';
var pointSelector = '.' + name + ' circle.dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var point = this.svg.select(pointSelector);
point
.style('display', null)
Expand Down
12 changes: 5 additions & 7 deletions test/lib/d4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3108,9 +3108,7 @@
var point = this.svg.select('.' + name).selectAll('.' + name + ' circle.dataPoint').data(data);
point.enter().append('circle');
point.exit().remove();
point.attr('data-key', function(d) {
return d.key;
})
point.attr('data-key', d4.functor(scope.accessors.key).bind(this))
.style('display', 'none')
.attr('r', d4.functor(scope.accessors.r).bind(this)())
.attr('class', function(d, n) {
Expand Down Expand Up @@ -3192,7 +3190,7 @@
d4.functor(this.features[name].accessors.showDataPoint).bind(this)(d, datum, n);
d4.functor(this.features[name].accessors.showDataLabel).bind(this)(d, datum, n);
} else {
var selector = '.' + name + ' .dataPoint[data-key="' + datum.key + '"]';
var selector = '.' + name + ' .dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var point = this.svg.select(selector);
point
.style('display', 'none');
Expand All @@ -3209,7 +3207,7 @@
r: 4.5,

showDataLabel: function(d, datum, n) {
var pointLabelSelector = '.' + name + ' text.dataPoint[data-key="' + datum.key + '"]';
var pointLabelSelector = '.' + name + ' text.dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var label = this.svg.select(pointLabelSelector);
var offset = n * 20;
label
Expand All @@ -3218,8 +3216,8 @@
.text(d4.functor(this.features[name].accessors.pointLabelText).bind(this)(d, datum));
},

showDataPoint: function(d, datum) {
var pointSelector = '.' + name + ' circle.dataPoint[data-key="' + datum.key + '"]';
showDataPoint: function(d, datum, n) {
var pointSelector = '.' + name + ' circle.dataPoint[data-key="' + d4.functor(this.features[name].accessors.key).bind(this)(datum, n) + '"]';
var point = this.svg.select(pointSelector);
point
.style('display', null)
Expand Down

0 comments on commit 5815928

Please sign in to comment.