]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Allow custom skip property to points
authorTanner Linsley <tannerlinsley@gmail.com>
Thu, 18 Jun 2015 18:49:09 +0000 (12:49 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Thu, 18 Jun 2015 18:49:09 +0000 (12:49 -0600)
src/controllers/controller.line.js
src/controllers/controller.radar.js

index 2e3e341e299e23b70995a6918ed875be7c57ad0d..fa5518b43e1d28a1311d86ae0284d2fe63234a36 100644 (file)
                                                backgroundColor: point.custom && point.custom.backgroundColor ? point.custom.backgroundColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor, index, this.chart.options.elements.point.backgroundColor),
                                                borderColor: point.custom && point.custom.borderColor ? point.custom.borderColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderColor, index, this.chart.options.elements.point.borderColor),
                                                borderWidth: point.custom && point.custom.borderWidth ? point.custom.borderWidth : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth, index, this.chart.options.elements.point.borderWidth),
-                                               skip: this.getDataset().data[index] === null,
+                                               skip: point.custom && point.custom.skip ? point.custom.skip : this.getDataset().data[index] === null,
 
                                                // Tooltip
                                                hitRadius: point.custom && point.custom.hitRadius ? point.custom.hitRadius : helpers.getValueAtIndexOrDefault(this.getDataset().hitRadius, index, this.chart.options.elements.point.hitRadius),
index df35de5b1925ea841e33ef171f1bffad86f57cb8..e7577887f77edb3fc4a6534cfd17563d718cfd28 100644 (file)
                                                backgroundColor: point.custom && point.custom.backgroundColor ? point.custom.backgroundColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor, index, this.chart.options.elements.point.backgroundColor),
                                                borderColor: point.custom && point.custom.borderColor ? point.custom.borderColor : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderColor, index, this.chart.options.elements.point.borderColor),
                                                borderWidth: point.custom && point.custom.borderWidth ? point.custom.borderWidth : helpers.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth, index, this.chart.options.elements.point.borderWidth),
-                                               skip: this.getDataset().data[index] === null,
+                                               skip: point.custom && point.custom.skip ? point.custom.skip : this.getDataset().data[index] === null,
 
                                                // Tooltip
                                                hitRadius: point.custom && point.custom.hitRadius ? point.custom.hitRadius : helpers.getValueAtIndexOrDefault(this.getDataset().hitRadius, index, this.chart.options.elements.point.hitRadius),