Skip to content

Commit 3e1b120

Browse files
committed
Build latest output files for new version
1 parent 9584470 commit 3e1b120

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Chart.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,9 @@
873873
yMin;
874874
helpers.each(this.datasets, function(dataset){
875875
dataCollection = dataset.points || dataset.bars || dataset.segments;
876-
Elements.push(dataCollection[dataIndex]);
876+
if (dataCollection[dataIndex]){
877+
Elements.push(dataCollection[dataIndex]);
878+
}
877879
});
878880

879881
helpers.each(Elements, function(element) {
@@ -1996,6 +1998,7 @@
19961998
datasetObject.bars.push(new this.BarClass({
19971999
value : dataPoint,
19982000
label : data.labels[index],
2001+
datasetLabel: dataset.label,
19992002
strokeColor : dataset.strokeColor,
20002003
fillColor : dataset.fillColor,
20012004
highlightFill : dataset.highlightFill || dataset.fillColor,
@@ -2470,8 +2473,7 @@
24702473
datasetObject.points.push(new this.PointClass({
24712474
value : dataPoint,
24722475
label : data.labels[index],
2473-
// x: this.scale.calculateX(index),
2474-
// y: this.scale.endPoint,
2476+
datasetLabel: dataset.label,
24752477
strokeColor : dataset.pointStrokeColor,
24762478
fillColor : dataset.pointColor,
24772479
highlightFill : dataset.pointHighlightFill || dataset.pointColor,
@@ -3079,6 +3081,7 @@
30793081
datasetObject.points.push(new this.PointClass({
30803082
value : dataPoint,
30813083
label : data.labels[index],
3084+
datasetLabel: dataset.label,
30823085
x: (this.options.animation) ? this.scale.xCenter : pointPosition.x,
30833086
y: (this.options.animation) ? this.scale.yCenter : pointPosition.y,
30843087
strokeColor : dataset.pointStrokeColor,
@@ -3233,6 +3236,7 @@
32333236
this.eachPoints(function(point){
32343237
point.save();
32353238
});
3239+
this.reflow();
32363240
this.render();
32373241
},
32383242
reflow: function(){

0 commit comments

Comments
 (0)