Version 2.7.0

.codeclimate.yml

@@ -4,8 +4,6 @@ engines:
     config:
       languages:
       - javascript
-    exclude_paths:
-    - "samples/samples.js"
   eslint:
     enabled: true
     channel: "eslint-3"
@@ -15,7 +13,13 @@ ratings:
   paths:
   - "src/**/*.js"
 exclude_paths:
-- dist/**/*
-- node_modules/**/*
-- test/**/*
-- coverage/**/*
+- '.github/'
+- 'dist/'
+- 'test/'
+- 'docs/'
+- 'samples/'
+- 'scripts/'
+- '**.md'
+- '**.json'
+- 'gulpfile.js'
+- 'karma.conf.js'

.editorconfig

@@ -8,3 +8,11 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = false
+
+[gulpfile.js]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2

.eslintrc

@@ -44,7 +44,7 @@ rules:
   accessor-pairs: 2
   array-callback-return: 0
   block-scoped-var: 0
-  complexity: [2, 6]
+  complexity: [2, 10]
   consistent-return: 0
   curly: [2, all]
   default-case: 2
@@ -183,7 +183,7 @@ rules:
   object-curly-spacing: [2, never]
   object-property-newline: 0
   one-var-declaration-per-line: 2
-  one-var: 0
+  one-var: [2, {initialized: never}]
   operator-assignment: 0
   operator-linebreak: 0
   padded-blocks: 0
@@ -197,8 +197,8 @@ rules:
   space-before-blocks: [2, always]
   space-before-function-paren: [2, never]
   space-in-parens: [2, never]
-  space-infix-ops: 0
-  space-unary-ops: 0
+  space-infix-ops: 2
+  space-unary-ops: [2, {words: true, nonwords: false}]
   spaced-comment: [2, always]
   unicode-bom: 0
   wrap-regex: 2

.gitignore

@@ -4,6 +4,7 @@
 /dist
 /docs/index.md
 /gh-pages
+/jsdoc
 /node_modules
 .DS_Store
 .idea

.travis.yml

@@ -1,15 +1,12 @@
 language: node_js
 node_js:
-  - "5.10"
+  - "6"
 
 before_install:
   - "export CHROME_BIN=/usr/bin/google-chrome"
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 
-before_script:
-  - npm install
-
 script:
   - gulp build
   - gulp test --coverage
@@ -25,29 +22,24 @@ sudo: required
 dist: trusty
 
 addons:
+  chrome: stable
   firefox: latest
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
-
 
 # IMPORTANT: scripts require GITHUB_AUTH_TOKEN and GITHUB_AUTH_EMAIL environment variables
 # IMPORTANT: scripts has to be set executables in the Git repository (error 127)
 # https://github.com/travis-ci/travis-ci/issues/5538#issuecomment-225025939
 
 deploy:
 - provider: script
-  script: ./scripts/release.sh
+  script: ./scripts/deploy.sh
   skip_cleanup: true
   on:
-    branch: release
+    all_branches: true
 - provider: script
-  script: ./scripts/deploy.sh
+  script: ./scripts/release.sh
   skip_cleanup: true
   on:
-    all_branches: true
+    branch: release
 - provider: releases
   api_key: $GITHUB_AUTH_TOKEN
   file:

README.md

@@ -1,8 +1,6 @@
 # Chart.js
 
-[![Build Status](https://travis-ci.org/chartjs/Chart.js.svg?branch=master)](https://travis-ci.org/chartjs/Chart.js) [![Code Climate](https://codeclimate.com/github/nnnick/Chart.js/badges/gpa.svg)](https://codeclimate.com/github/nnnick/Chart.js) [![Coverage Status](https://coveralls.io/repos/github/chartjs/Chart.js/badge.svg?branch=master)](https://coveralls.io/github/chartjs/Chart.js?branch=master)
-
-[![Chart.js on Slack](https://img.shields.io/badge/slack-Chart.js-blue.svg)](https://chart-js-automation.herokuapp.com/)
+[![travis](https://img.shields.io/travis/chartjs/Chart.js.svg?style=flat-square&maxAge=60)](https://travis-ci.org/chartjs/Chart.js) [![codeclimate](https://img.shields.io/codeclimate/github/chartjs/Chart.js.svg?style=flat-square&maxAge=600)](https://codeclimate.com/github/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) [![slack](https://img.shields.io/badge/slack-Chart.js-blue.svg?style=flat-square&maxAge=3600)](https://chart-js-automation.herokuapp.com/)
 
 *Simple HTML5 Charts using the canvas element* [chartjs.org](http://www.chartjs.org)
 
@@ -29,7 +27,7 @@ The `Chart.bundle.js` and `Chart.bundle.min.js` builds include Moment.js in a si
 
 ## 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/#notes-previous-versions](http://www.chartjs.org/docs/#notes-previous-versions).
+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).
 
 ## Contributing
 

docs/README.md

@@ -1,6 +1,6 @@
 # Chart.js
 
-[![Chart.js on Slack](https://img.shields.io/badge/slack-Chart.js-blue.svg)](https://chart-js-automation.herokuapp.com/)
+[![slack](https://img.shields.io/badge/slack-Chart.js-blue.svg?style=flat-square&maxAge=600)](https://chart-js-automation.herokuapp.com/)
 
 ## Installation
 

docs/SUMMARY.md

@@ -10,6 +10,7 @@
   * [Interactions](general/interactions/README.md)
     * [Events](general/interactions/events.md)
     * [Modes](general/interactions/modes.md)
+  * [Options](general/options.md)
   * [Colors](general/colors.md)
   * [Fonts](general/fonts.md)
 * [Configuration](configuration/README.md)
@@ -34,7 +35,7 @@
     * [Category](axes/cartesian/category.md)
     * [Linear](axes/cartesian/linear.md)
     * [Logarithmic](axes/cartesian/logarithmic.md)
-    * [Time](axes/cartesian/time.md) 
+    * [Time](axes/cartesian/time.md)
   * [Radial](axes/radial/README.md)
     * [Linear](axes/radial/linear.md)
   * [Labelling](axes/labelling.md)

docs/axes/cartesian/README.md

@@ -15,6 +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.
 | `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)
@@ -31,7 +32,7 @@ The following options are common to all cartesian axes but do not apply to other
 | `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.*
 | `minRotation` | `Number` | `0` | Minimum rotation for tick labels. *Note: Only applicable to horizontal scales.*
 | `mirror` | `Boolean` | `false` | Flips tick labels around axis, displaying the labels inside the chart instead of outside. *Note: Only applicable to vertical scales.*
-| `padding` | `Number` | `10` | Padding between the tick label and the axis. *Note: Only applicable to horizontal scales.*
+| `padding` | `Number` | `10` | Padding between the tick label and the axis. When set on a vertical axis, this applies in the horizontal (X) direction. When set on a horizontal axis, this applies in the vertical (Y) direction.
 
 ## Axis ID
 The properties `dataset.xAxisID` or `dataset.yAxisID` have to match the scale properties `scales.xAxes.id` or `scales.yAxes.id`. This is especially needed if multi-axes charts are used.
@@ -101,4 +102,4 @@ var myChart = new Chart(ctx, {
         }
     }
 });
-```
+```

docs/axes/cartesian/category.md

@@ -1,13 +1,46 @@
 # Category Cartesian Axis
 
-The category scale will be familiar to those who have used v1.0. Labels are drawn from one of the label arrays included in the chart data. If only `data.labels` is defined, this will be used. If `data.xLabels` is defined and the axis is horizontal, this will be used. Similarly, if `data.yLabels` is defined and the axis is vertical, this property will be used. Using both `xLabels` and `yLabels` together can create a chart that uses strings for both the X and Y axes.
+If global configuration is used, labels are drawn from one of the label arrays included in the chart data. If only `data.labels` is defined, this will be used. If `data.xLabels` is defined and the axis is horizontal, this will be used. Similarly, if `data.yLabels` is defined and the axis is vertical, this property will be used. Using both `xLabels` and `yLabels` together can create a chart that uses strings for both the X and Y axes.
+
+Specifying any of the settings above defines the x axis as `type: category` if not defined otherwise. For more fine-grained control of category labels it is also possible to add `labels` as part of the category axis definition. Doing so does not apply the global defaults.
+
+## Category Axis Definition
+
+Globally:
+
+```javascript
+let chart = new Chart(ctx, {
+    type: ...
+    data: {
+        labels: ['January', 'February', 'March', 'April', 'May', 'June'],
+        datasets: ...
+    },
+});
+```
+As part of axis definition:
+
+```javascript
+let chart = new Chart(ctx, {
+    type: ...
+    data: ...
+    options: {
+        scales: {
+            xAxes: [{
+                type: 'category',
+                labels: ['January', 'February', 'March', 'April', 'May', 'June'],
+            }]
+        }
+    }
+});
+```
 
 ## Tick Configuration Options
 
 The category scale provides the following options for configuring tick marks. They are nested in the `ticks` sub object. These options extend the [common tick configuration](README.md#tick-configuration).
 
 | Name | Type | Default | Description
 | -----| ---- | --------| -----------
+| labels | Array[String] | - | An array of labels to display.
 | `min` | `String` | | The minimum item to display. [more...](#min-max-configuration)
 | `max` | `String` | | The maximum item to display. [more...](#min-max-configuration)
 

docs/axes/cartesian/time.md

@@ -2,28 +2,46 @@
 
 The time scale is used to display times and dates. When building its ticks, it will automatically calculate the most comfortable unit base on the size of the scale.
 
-## Configuration Options
+## Data Sets
 
-The following options are provided by the time scale. They are all located in the `time` sub options. These options extend the [common tick configuration](README.md#tick-configuration).
+### Input Data
+
+The x-axis data points may additionally be specified via the `t` attribute when using the time scale.
+
+    data: [{
+        x: new Date(),
+        y: 1
+    }, {
+        t: new Date(),
+        y: 10
+    }]
 
-| Name | Type | Default | Description
-| -----| ---- | --------| -----------
-| `displayFormats` | `Object` | | Sets how different time units are displayed. [more...](#display-formats)
-| `isoWeekday` | `Boolean` | `false` | If true and the unit is set to 'week', iso weekdays will be used.
-| `max` | [Time](#date-formats) | | If defined, this will override the data maximum
-| `min` | [Time](#date-formats) | | If defined, this will override the data minimum
-| `parser` | `String` or `Function` | | Custom parser for dates. [more...](#parser)
-| `round` | `String` | `false` | If defined, dates will be rounded to the start of this unit. See [Time Units](#scales-time-units) below for the allowed units.
-| `tooltipFormat` | `String` | | The moment js format string to use for the tooltip.
-| `unit` | `String` | `false` | If defined, will force the unit to be a certain type. See [Time Units](#scales-time-units) section below for details.
-| `unitStepSize` | `Number` | `1` | The number of units between grid lines.
-| `minUnit` | `String` | `millisecond` | The minimum display format to be used for a time unit.
-
-## Date Formats
+
+### 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.
 
-## Time Units
+## Configuration Options
+
+The following options are provided by the time scale. You may also set options provided by the [common tick configuration](README.md#tick-configuration).
+
+| Name | Type | Default | Description
+| -----| ---- | --------| -----------
+| `distribution` | `String` | `linear` | How data is plotted. [more...](#scale-distribution)
+| `bounds` | `String` | `data` | Determines the scale bounds. [more...](#scale-bounds)
+| `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.parser` | `String` or `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.
+| `time.unit` | `String` | `false` | If defined, will force the unit to be a certain type. See [Time Units](#time-units) section below for details.
+| `time.stepSize` | `Number` | `1` | The number of units between grid lines.
+| `time.minUnit` | `String` | `'millisecond'` | The minimum display format to be used for a time unit.
+
+### Time Units
 
 The following time measurements are supported. The names can be passed as strings to the `time.unit` config option to force a certain unit.
 
@@ -55,20 +73,20 @@ var chart = new Chart(ctx, {
 })
 ```
 
-## Display Formats
+### 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.
 
-Name | Default
---- | ---
-millisecond | 'SSS [ms]'
-second | 'h:mm:ss a'
-minute | 'h:mm:ss a'
-hour | 'MMM D, hA'
-day | 'll'
-week | 'll'
-month | 'MMM YYYY'
-quarter | '[Q]Q - YYYY'
-year | 'YYYY'
+Name | Default | Example
+--- | --- | ---
+millisecond | 'h:mm:ss.SSS a' | 11:20:01.123 AM
+second | 'h:mm:ss a' | 11:20:01 AM
+minute | 'h:mm a' | 11:20 AM
+hour | 'hA' | 11AM
+day | 'MMM D' | Sep 4
+week | 'll' | Sep 4 2015
+month | 'MMM YYYY' | Sep 2015
+quarter | '[Q]Q - YYYY' | Q3 - 2015
+year | 'YYYY' | 2015
 
 For example, to set the display format for the 'quarter' unit to show the month and year, the following config would be passed to the chart constructor.
 
@@ -91,7 +109,44 @@ var chart = new Chart(ctx, {
 })
 ```
 
-## Parser
+### Scale Distribution
+
+The `distribution` property controls the data distribution along the scale:
+
+  * `'linear'`: data are spread according to their time (distances can vary)
+  * `'series'`: data are spread at the same distance from each other
+
+```javascript
+var chart = new Chart(ctx, {
+    type: 'line',
+    data: data,
+    options: {
+        scales: {
+            xAxes: [{
+                type: 'time',
+                distribution: 'series'
+            }]
+        }
+    }
+})
+```
+
+### Scale Bounds
+
+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
+
+* `'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
+
+### Parser
 If this property is defined as a string, it is interpreted as a custom format to be used by moment to parse the date. 
 
-If this is a function, it must return a moment.js object given the appropriate data value.
+If this is a function, it must return a moment.js object given the appropriate data value.