From: Evert Timberg Date: Sun, 17 Apr 2016 01:50:45 +0000 (-0400) Subject: Update docs X-Git-Tag: 2.1.0~69^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2276%2Fhead;p=thirdparty%2FChart.js.git Update docs --- diff --git a/docs/01-Scales.md b/docs/01-Scales.md index e7a84ddab..68737b6e0 100644 --- a/docs/01-Scales.md +++ b/docs/01-Scales.md @@ -35,6 +35,7 @@ afterUpdate | Function | undefined | Callback that runs at the end of the update *gridLines*.lineWidth | Number | 1 | Stroke width of grid lines *gridLines*.drawOnChartArea | Boolean | true | If true, draw lines on the chart area inside the axis lines. This is useful when there are multiple axes and you need to control which grid lines are drawn *gridLines*.drawTicks | Boolean | true | If true, draw lines beside the ticks in the axis area beside the chart. +*gridLines*.tickMarkLength | Number | 10 | Length in pixels that the grid lines will draw into the axis area. *gridLines*.zeroLineWidth | Number | 1 | Stroke width of the grid line for the first index (index 0). *gridLines*.zeroLineColor | Color | "rgba(0, 0, 0, 0.25)" | Stroke color of the grid line for the first index (index 0). *gridLines*.offsetGridLines | Boolean | false | If true, offset labels from grid lines. diff --git a/test/core.helpers.tests.js b/test/core.helpers.tests.js index 7bc5dc3c7..9638a373a 100644 --- a/test/core.helpers.tests.js +++ b/test/core.helpers.tests.js @@ -248,7 +248,7 @@ describe('Core helper tests', function() { color: "rgba(0, 0, 0, 0.1)", drawOnChartArea: true, drawTicks: true, // draw ticks extending towards the label, - tickMarkLength: 10 + tickMarkLength: 10, lineWidth: 1, offsetGridLines: false, display: true,