Merge branch 'master' into issue-5621

.editorconfig

@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# https://editorconfig.org
 root = true
 
 [*]
@@ -7,7 +7,7 @@ indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = false
+insert_final_newline = true
 
 [gulpfile.js]
 indent_style = space

.github/ISSUE_TEMPLATE.md

@@ -4,8 +4,8 @@ Please consider the following before submitting an issue:
 - Ask questions and get support on StackOverflow: https://stackoverflow.com/questions/tagged/chart.js
 - DO NOT create issues for questions or support requests.
 - Issues are reserved for BUG reports and FEATURE requests.
-- Most features should start as plugins outside of Chart.js (http://www.chartjs.org/docs/#advanced-usage-creating-plugins).
-- Bug reports MUST be submitted with an interactive example (http://codepen.io/pen?template=JXVYzq).
+- Most features should start as plugins outside of Chart.js (https://www.chartjs.org/docs/#advanced-usage-creating-plugins).
+- Bug reports MUST be submitted with an interactive example (https://codepen.io/pen?template=JXVYzq).
 - Chart.js 1.x is NOT supported anymore, new issues will be disregarded.
 -->
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,8 +4,8 @@ Please consider the following before submitting a pull request:
 Guidelines for contributing: https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md
 
 Example of changes on an interactive website such as the following:
-- http://jsbin.com/
-- http://jsfiddle.net/
-- http://codepen.io/pen/
-- Premade template: http://codepen.io/pen?template=JXVYzq
+- https://jsbin.com/
+- https://jsfiddle.net/
+- https://codepen.io/pen/
+- Premade template: https://codepen.io/pen?template=JXVYzq
 -->

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "6"
+  - lts/*
 
 before_install:
   - "export CHROME_BIN=/usr/bin/google-chrome"

MAINTAINING.md

@@ -5,7 +5,7 @@ Chart.js relies on [Travis CI](https://travis-ci.org/) to automate the library [
 ### Releasing a New Version
 
 1. draft release notes on [GitHub](https://github.com/chartjs/Chart.js/releases/new) for the upcoming tag
-1. update `master` `package.json` version using [semver](http://semver.org/) semantic
+1. update `master` `package.json` version using [semver](https://semver.org/) semantic
 1. merge `master` into the `release` branch
 1. follow the build process on [Travis CI](https://travis-ci.org/chartjs/Chart.js)
 

README.md

@@ -2,7 +2,7 @@
 
 [![travis](https://img.shields.io/travis/chartjs/Chart.js.svg?style=flat-square&maxAge=60)](https://travis-ci.org/chartjs/Chart.js) [![coveralls](https://img.shields.io/coveralls/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://coveralls.io/github/chartjs/Chart.js?branch=master) [![codeclimate](https://img.shields.io/codeclimate/maintainability/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://codeclimate.com/github/chartjs/Chart.js) [![slack](https://img.shields.io/badge/slack-chartjs-blue.svg?style=flat-square&maxAge=3600)](https://chartjs-slack.herokuapp.com/)
 
-*Simple HTML5 Charts using the canvas element* [chartjs.org](http://www.chartjs.org)
+*Simple HTML5 Charts using the canvas element* [chartjs.org](https://www.chartjs.org)
 
 ## Installation
 
@@ -28,7 +28,7 @@ Files:
 * `dist/Chart.js`
 * `dist/Chart.min.js`
 
-The stand-alone build includes Chart.js as well as the color parsing library. If this version is used, you are required to include [Moment.js](http://momentjs.com/) before Chart.js for the functionality of the time axis.
+The stand-alone build includes Chart.js as well as the color parsing library. If this version is used, you are required to include [Moment.js](https://momentjs.com/) before Chart.js for the functionality of the time axis.
 
 #### Bundled Build
 Files:
@@ -39,11 +39,11 @@ The bundled build includes Moment.js in a single file. You should use this versi
 
 ## Documentation
 
-You can find documentation at [www.chartjs.org/docs](http://www.chartjs.org/docs). The markdown files that build the site are available under `/docs`. Previous version documentation is available at [www.chartjs.org/docs/latest/developers/#previous-versions](http://www.chartjs.org/docs/latest/developers/#previous-versions).
+You can find documentation at [www.chartjs.org/docs](https://www.chartjs.org/docs). The markdown files that build the site are available under `/docs`. Previous version documentation is available at [www.chartjs.org/docs/latest/developers/#previous-versions](https://www.chartjs.org/docs/latest/developers/#previous-versions).
 
 ## Contributing
 
-Before submitting an issue or a pull request, please take a moment to look over the [contributing guidelines](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md) first. For support using Chart.js, please post questions with the [`chartjs` tag on Stack Overflow](http://stackoverflow.com/questions/tagged/chartjs).
+Before submitting an issue or a pull request, please take a moment to look over the [contributing guidelines](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md) first. For support using Chart.js, please post questions with the [`chartjs` tag on Stack Overflow](https://stackoverflow.com/questions/tagged/chartjs).
 
 ## Building
 Instructions on building and testing Chart.js can be found in [the documentation](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md#building-and-testing).
@@ -54,4 +54,4 @@ Instructions on building and testing Chart.js can be found in [the documentation
 
 ## License
 
-Chart.js is available under the [MIT license](http://opensource.org/licenses/MIT).
+Chart.js is available under the [MIT license](https://opensource.org/licenses/MIT).

composer.json

@@ -6,7 +6,7 @@
         "chart",
         "js"
     ],
-    "homepage": "http://www.chartjs.org/",
+    "homepage": "https://www.chartjs.org/",
     "license": "MIT",
     "authors": [
         {

docs/README.md

@@ -10,7 +10,7 @@ You can download the latest version of Chart.js from the [GitHub releases](https
 
 It's easy to get started with Chart.js. All that's required is the script included in your page along with a single `<canvas>` node to render the chart.
 
-In this example, we create a bar chart for a single dataset and render that in our page. You can see all the ways to use Chart.js in the [usage documentation](./getting-started/usage.md)
+In this example, we create a bar chart for a single dataset and render that in our page. You can see all the ways to use Chart.js in the [usage documentation](./getting-started/usage.md).
 ```html
 <canvas id="myChart" width="400" height="400"></canvas>
 <script>
@@ -58,8 +58,8 @@ var myChart = new Chart(ctx, {
 
 Before submitting an issue or a pull request to the project, please take a moment to look over the [contributing guidelines](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md) first.
 
-For support using Chart.js, please post questions with the [`chartjs` tag on Stack Overflow](http://stackoverflow.com/questions/tagged/chartjs).
+For support using Chart.js, please post questions with the [`chartjs` tag on Stack Overflow](https://stackoverflow.com/questions/tagged/chartjs).
 
 ## License
 
-Chart.js is available under the [MIT license](http://opensource.org/licenses/MIT).
+Chart.js is available under the [MIT license](https://opensource.org/licenses/MIT).

docs/SUMMARY.md

@@ -6,6 +6,7 @@
   * [Integration](getting-started/integration.md)
   * [Usage](getting-started/usage.md)
 * [General](general/README.md)
+  * [Accessibility](general/accessibility.md)
   * [Responsive](general/responsive.md)
   * [Pixel Ratio](general/device-pixel-ratio.md)
   * [Interactions](general/interactions/README.md)

docs/axes/README.md

@@ -4,19 +4,19 @@ Axes are an integral part of a chart. They are used to determine how data maps t
 
 In a radial chart, such as a radar chart or a polar area chart, there is a single axis that maps points in the angular and radial directions. These are known as ['radial axes'](./radial/README.md#radial-axes).
 
-Scales in Chart.js >V2.0 are significantly more powerful, but also different than those of v1.0.
+Scales in Chart.js >v2.0 are significantly more powerful, but also different than those of v1.0.
 * Multiple X & Y axes are supported.
 * A built-in label auto-skip feature detects would-be overlapping ticks and labels and removes every nth label to keep things displaying normally.
-* Scale titles are supported
-* New scale types can be extended without writing an entirely new chart type
+* Scale titles are supported.
+* New scale types can be extended without writing an entirely new chart type.
 
 # Common Configuration
 
-The following properties are common to all axes provided by Chart.js
+The following properties are common to all axes provided by Chart.js.
 
 | Name | Type | Default | Description
 | ---- | ---- | ------- | -----------
-| `display` | `Boolean` | `true` | If set to `false` the axis is hidden from view. Overrides *gridLines.display*, *scaleLabel.display*, and *ticks.display*.
+| `display` | `Boolean`/`String` | `true` | Controls the axis global visibility (visible when `true`, hidden when `false`). When `display: 'auto'`, the axis is visible only if at least one associated dataset is visible.
 | `callbacks` | `Object` | | Callback functions to hook into the axis lifecycle. [more...](#callbacks)
 | `weight` | `Number` | `0` | The weight used to sort the axis. Higher weights are further away from the chart area.
 

docs/axes/cartesian/README.md

@@ -15,7 +15,7 @@ All of the included cartesian axes support a number of common options.
 | -----| ---- | --------| -----------
 | `type` | `String` | | Type of scale being employed. Custom scales can be created and registered with a string key. This allows changing the type of an axis for a chart.
 | `position` | `String` | | Position of the axis in the chart. Possible values are: `'top'`, `'left'`, `'bottom'`, `'right'`
-| `offset` | `Boolean` | `false` | If true, extra space is added to the both edges and the axis is scaled to fit into the chart area. This is set to `true` in the bar chart by default.
+| `offset` | `Boolean` | `false` | If true, extra space is added to the both edges and the axis is scaled to fit into the chart area. This is set to `true` for a category scale in a bar chart by default.
 | `id` | `String` | | The ID is used to link datasets and scale axes together. [more...](#axis-id)
 | `gridLines` | `Object` | | Grid line configuration. [more...](../styling.md#grid-line-configuration)
 | `scaleLabel` | `Object` | | Scale title configuration. [more...](../labelling.md#scale-title-configuration)
@@ -26,7 +26,7 @@ The following options are common to all cartesian axes but do not apply to other
 
 | Name | Type | Default | Description
 | -----| ---- | --------| -----------
-| `autoSkip` | `Boolean` | `true` | If true, automatically calculates how many labels that can be shown and hides labels accordingly. Turn it off to show all labels no matter what
+| `autoSkip` | `Boolean` | `true` | If true, automatically calculates how many labels that can be shown and hides labels accordingly. Turn it off to show all labels no matter what.
 | `autoSkipPadding` | `Number` | `0` | Padding between the ticks on the horizontal axis when `autoSkip` is enabled. *Note: Only applicable to horizontal scales.*
 | `labelOffset` | `Number` | `0` | Distance in pixels to offset the label from the centre point of the tick (in the y direction for the x axis, and the x direction for the y axis). *Note: this can cause labels at the edges to be cropped by the edge of the canvas*
 | `maxRotation` | `Number` | `90` | Maximum rotation for tick labels when rotating to condense labels. Note: Rotation doesn't occur until necessary. *Note: Only applicable to horizontal scales.*

docs/axes/cartesian/time.md

@@ -19,7 +19,7 @@ The x-axis data points may additionally be specified via the `t` or `x` attribut
 
 ### Date Formats
 
-When providing data for the time scale, Chart.js supports all of the formats that Moment.js accepts. See [Moment.js docs](http://momentjs.com/docs/#/parsing/) for details.
+When providing data for the time scale, Chart.js supports all of the formats that Moment.js accepts. See [Moment.js docs](https://momentjs.com/docs/#/parsing/) for details.
 
 ## Configuration Options
 
@@ -32,8 +32,8 @@ The following options are provided by the time scale. You may also set options p
 | `ticks.source` | `String` | `auto` | How ticks are generated. [more...](#ticks-source)
 | `time.displayFormats` | `Object` | | Sets how different time units are displayed. [more...](#display-formats)
 | `time.isoWeekday` | `Boolean` | `false` | If true and the unit is set to 'week', then the first day of the week will be Monday. Otherwise, it will be Sunday.
-| `time.max` | [Time](#date-formats) | | If defined, this will override the data maximum
-| `time.min` | [Time](#date-formats) | | If defined, this will override the data minimum
+| `time.max` | [Time](#date-formats) | | If defined, this will override the data maximum.
+| `time.min` | [Time](#date-formats) | | If defined, this will override the data minimum.
 | `time.parser` | `String/Function` | | Custom parser for dates. [more...](#parser)
 | `time.round` | `String` | `false` | If defined, dates will be rounded to the start of this unit. See [Time Units](#time-units) below for the allowed units.
 | `time.tooltipFormat` | `String` | | The moment js format string to use for the tooltip.
@@ -75,7 +75,7 @@ var chart = new Chart(ctx, {
 ```
 
 ### Display Formats
-The following display formats are used to configure how different time units are formed into strings for the axis tick marks. See [moment.js](http://momentjs.com/docs/#/displaying/format/) for the allowable format strings.
+The following display formats are used to configure how different time units are formed into strings for the axis tick marks. See [moment.js](https://momentjs.com/docs/#/displaying/format/) for the allowable format strings.
 
 Name | Default | Example
 --- | --- | ---
@@ -134,16 +134,16 @@ var chart = new Chart(ctx, {
 
 ### Scale Bounds
 
-The `bounds` property controls the scale boundary strategy (bypassed by min/max time options)
+The `bounds` property controls the scale boundary strategy (bypassed by min/max time options).
 
 * `'data'`: make sure data are fully visible, labels outside are removed
 * `'ticks'`: make sure ticks are fully visible, data outside are truncated
 
 ### Ticks Source
 
-The `ticks.source` property controls the ticks generation
+The `ticks.source` property controls the ticks generation.
 
-* `'auto'`: generates "optimal" ticks based on scale size and time options.
+* `'auto'`: generates "optimal" ticks based on scale size and time options
 * `'data'`: generates ticks from data (including labels from data `{t|x|y}` objects)
 * `'labels'`: generates ticks from user given `data.labels` values ONLY
 

docs/axes/labelling.md

@@ -10,7 +10,7 @@ The scale label configuration is nested under the scale configuration in the `sc
 | -----| ---- | --------| -----------
 | `display` | `Boolean` | `false` | If true, display the axis title.
 | `labelString` | `String` | `''` | The text for the title. (i.e. "# of People" or "Response Choices").
-| `lineHeight` | `Number/String` | `1.2` | Height of an individual line of text (see [MDN](https://developer.mozilla.org/en-US/docs/Web/CSS/line-height))
+| `lineHeight` | `Number/String` | `1.2` | Height of an individual line of text (see [MDN](https://developer.mozilla.org/en-US/docs/Web/CSS/line-height)).
 | `fontColor` | `Color` | `'#666'` | Font color for scale title.
 | `fontFamily` | `String` | `"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"` | Font family for the scale title, follows CSS font-family options.
 | `fontSize` | `Number` | `12` | Font size for scale title.
@@ -20,7 +20,7 @@ The scale label configuration is nested under the scale configuration in the `sc
 ## Creating Custom Tick Formats
 
 It is also common to want to change the tick marks to include information about the data type. For example, adding a dollar sign ('$'). To do this, you need to override the `ticks.callback` method in the axis configuration.
-In the following example, every label of the Y axis would be displayed with a dollar sign at the front..
+In the following example, every label of the Y axis would be displayed with a dollar sign at the front.
 
 If the callback returns `null` or `undefined` the associated grid line will be hidden.
 

docs/axes/radial/linear.md

@@ -20,7 +20,7 @@ The following options are provided by the linear scale. They are all located in
 
 | Name | Type | Default | Description
 | -----| ---- | --------| -----------
-| `backdropColor` | `Color` | `'rgba(255, 255, 255, 0.75)'` | Color of label backdrops
+| `backdropColor` | `Color` | `'rgba(255, 255, 255, 0.75)'` | Color of label backdrops.
 | `backdropPaddingX` | `Number` | `2` | Horizontal padding of label backdrop.
 | `backdropPaddingY` | `Number` | `2` | Vertical padding of label backdrop.
 | `beginAtZero` | `Boolean` | `false` | if true, scale will include 0 if it is not already included.
@@ -31,7 +31,7 @@ The following options are provided by the linear scale. They are all located in
 | `stepSize` | `Number` | | User defined fixed step size for the scale. [more...](#step-size)
 | `suggestedMax` | `Number` | | Adjustment used when calculating the maximum data value. [more...](#axis-range-settings)
 | `suggestedMin` | `Number` | | Adjustment used when calculating the minimum data value. [more...](#axis-range-settings)
-| `showLabelBackdrop` | `Boolean` | `true` | If true, draw a background behind the tick labels
+| `showLabelBackdrop` | `Boolean` | `true` | If true, draw a background behind the tick labels.
 
 ## Axis Range Settings
 
@@ -76,14 +76,12 @@ This example sets up a chart with a y axis that creates ticks at `0, 0.5, 1, 1.5
 
 ```javascript
 let options = {
-    scales: {
-        yAxes: [{
-            ticks: {
-                max: 5,
-                min: 0,
-                stepSize: 0.5
-            }
-        }]
+    scale: {
+        ticks: {
+            max: 5,
+            min: 0,
+            stepSize: 0.5
+        }
     }
 };
 ```
@@ -94,9 +92,11 @@ The following options are used to configure angled lines that radiate from the c
 
 | Name | Type | Default | Description
 | -----| ---- | --------| -----------
-| `display` | `Boolean` | `true` | if true, angle lines are shown
-| `color` | `Color` | `rgba(0, 0, 0, 0.1)` | Color of angled lines
-| `lineWidth` | `Number` | `1` | Width of angled lines
+| `display` | `Boolean` | `true` | if true, angle lines are shown.
+| `color` | `Color` | `rgba(0, 0, 0, 0.1)` | Color of angled lines.
+| `lineWidth` | `Number` | `1` | Width of angled lines.
+| `borderDash` | `Number[]` | `[]` | Length and spacing of dashes on angled lines. See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash).
+| `borderDashOffset` | `Number` | `0.0` | Offset for line dashes. See [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineDashOffset).
 
 ## Point Label Options
 
@@ -107,5 +107,6 @@ The following options are used to configure the point labels that are shown on t
 | `callback` | `Function` | | Callback function to transform data labels to point labels. The default implementation simply returns the current string.
 | `fontColor` | `Color/Color[]` | `'#666'` | Font color for point labels.
 | `fontFamily` | `String` | `"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"` | Font family to use when rendering labels.
-| `fontSize` | `Number` | 10 | font size in pixels
+| `fontSize` | `Number` | 10 | font size in pixels.
 | `fontStyle` | `String` | `'normal'` | Font style to use when rendering point labels.
+| `lineHeight` | `Number/String` | `1.2` | Height of an individual line of text (see [MDN](https://developer.mozilla.org/en-US/docs/Web/CSS/line-height)).