|
873 | 873 | yMin; |
874 | 874 | helpers.each(this.datasets, function(dataset){ |
875 | 875 | dataCollection = dataset.points || dataset.bars || dataset.segments; |
876 | | - Elements.push(dataCollection[dataIndex]); |
| 876 | + if (dataCollection[dataIndex]){ |
| 877 | + Elements.push(dataCollection[dataIndex]); |
| 878 | + } |
877 | 879 | }); |
878 | 880 |
|
879 | 881 | helpers.each(Elements, function(element) { |
|
1996 | 1998 | datasetObject.bars.push(new this.BarClass({ |
1997 | 1999 | value : dataPoint, |
1998 | 2000 | label : data.labels[index], |
| 2001 | + datasetLabel: dataset.label, |
1999 | 2002 | strokeColor : dataset.strokeColor, |
2000 | 2003 | fillColor : dataset.fillColor, |
2001 | 2004 | highlightFill : dataset.highlightFill || dataset.fillColor, |
|
2470 | 2473 | datasetObject.points.push(new this.PointClass({ |
2471 | 2474 | value : dataPoint, |
2472 | 2475 | label : data.labels[index], |
2473 | | - // x: this.scale.calculateX(index), |
2474 | | - // y: this.scale.endPoint, |
| 2476 | + datasetLabel: dataset.label, |
2475 | 2477 | strokeColor : dataset.pointStrokeColor, |
2476 | 2478 | fillColor : dataset.pointColor, |
2477 | 2479 | highlightFill : dataset.pointHighlightFill || dataset.pointColor, |
|
3079 | 3081 | datasetObject.points.push(new this.PointClass({ |
3080 | 3082 | value : dataPoint, |
3081 | 3083 | label : data.labels[index], |
| 3084 | + datasetLabel: dataset.label, |
3082 | 3085 | x: (this.options.animation) ? this.scale.xCenter : pointPosition.x, |
3083 | 3086 | y: (this.options.animation) ? this.scale.yCenter : pointPosition.y, |
3084 | 3087 | strokeColor : dataset.pointStrokeColor, |
|
3233 | 3236 | this.eachPoints(function(point){ |
3234 | 3237 | point.save(); |
3235 | 3238 | }); |
| 3239 | + this.reflow(); |
3236 | 3240 | this.render(); |
3237 | 3241 | }, |
3238 | 3242 | reflow: function(){ |
|
0 commit comments