From: Tanner Linsley Date: Mon, 21 Sep 2015 19:17:27 +0000 (-0600) Subject: Ensure bar width at least 1px X-Git-Tag: 2.0.0-alpha4~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c94ae0441205eb90d493b728893bca7f491712f;p=thirdparty%2FChart.js.git Ensure bar width at least 1px --- diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js index 1650d523c..be4645345 100644 --- a/src/scales/scale.category.js +++ b/src/scales/scale.category.js @@ -87,9 +87,9 @@ var baseWidth = Math.max(this.calculateBaseWidth() - (this.options.stacked ? 0 : (barDatasetCount - 1) * this.options.spacing), 1); if (this.options.stacked) { - return baseWidth; + return Math.max(baseWidth, 1); } - return (baseWidth / barDatasetCount); + return Math.max((baseWidth / barDatasetCount), 1); }, calculateBarX: function(barDatasetCount, datasetIndex, elementIndex) { var xWidth = this.calculateBaseWidth(), diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index b63d821b7..ef7d07f18 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -229,9 +229,9 @@ var baseWidth = this.calculateBaseWidth() - ((barDatasetCount - 1) * this.options.spacing); if (this.options.stacked) { - return baseWidth; + return Math.max(baseWidth, 1); } - return (baseWidth / barDatasetCount); + return Math.max((baseWidth / barDatasetCount), 1); }, calculateBarX: function(barDatasetCount, datasetIndex, elementIndex) {