diff --git a/.codeclimate.yml b/.codeclimate.yml
index fcc885c82..0b8340feb 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,25 +1,19 @@
-engines:
+version: "2"
+plugins:
duplication:
enabled: true
config:
languages:
- - javascript
- eslint:
- enabled: true
- channel: "eslint-3"
+ - javascript
fixme:
enabled: true
-ratings:
- paths:
- - "src/**/*.js"
-exclude_paths:
-- '.github/'
-- 'dist/'
-- 'test/'
-- 'docs/'
-- 'samples/'
-- 'scripts/'
-- '**.md'
-- '**.json'
-- 'gulpfile.js'
-- 'karma.conf.js'
+exclude_patterns:
+ - "dist/"
+ - "docs/"
+ - "samples/"
+ - "scripts/"
+ - "test/"
+ - "*.js"
+ - "*.json"
+ - "*.md"
+ - ".*"
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 6a31e4b6e..000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,224 +0,0 @@
-ecmaFeatures:
- modules: true
- jsx: true
-
-env:
- amd: true
- browser: true
- es6: true
- jquery: true
- node: true
-
-# http://eslint.org/docs/rules/
-rules:
- # Possible Errors
- no-cond-assign: 2
- no-console: [2, {allow: [warn, error]}]
- no-constant-condition: 2
- no-control-regex: 2
- no-debugger: 2
- no-dupe-args: 2
- no-dupe-keys: 2
- no-duplicate-case: 2
- no-empty: 2
- no-empty-character-class: 2
- no-ex-assign: 2
- no-extra-boolean-cast: 2
- no-extra-parens: [2, functions]
- no-extra-semi: 2
- no-func-assign: 2
- no-inner-declarations: [2, functions]
- no-invalid-regexp: 2
- no-irregular-whitespace: 2
- no-negated-in-lhs: 2
- no-obj-calls: 2
- no-regex-spaces: 2
- no-sparse-arrays: 2
- no-unexpected-multiline: 2
- no-unreachable: 2
- use-isnan: 2
- valid-jsdoc: 0
- valid-typeof: 2
-
- # Best Practices
- accessor-pairs: 2
- array-callback-return: 0
- block-scoped-var: 0
- complexity: [2, 10]
- consistent-return: 0
- curly: [2, all]
- default-case: 2
- dot-location: 0
- dot-notation: 2
- eqeqeq: 2
- guard-for-in: 2
- no-alert: 2
- no-caller: 2
- no-case-declarations: 2
- no-div-regex: 2
- no-else-return: 2
- no-empty-pattern: 2
- no-eq-null: 2
- no-eval: 2
- no-extend-native: 2
- no-extra-bind: 2
- no-fallthrough: 2
- no-floating-decimal: 2
- no-implicit-coercion: 0
- no-implied-eval: 2
- no-invalid-this: 0
- no-iterator: 2
- no-labels: 2
- no-lone-blocks: 2
- no-loop-func: 2
- no-magic-number: 0
- no-multi-spaces: 2
- no-multi-str: 2
- no-native-reassign: 2
- no-new-func: 2
- no-new-wrappers: 2
- no-new: 2
- no-octal-escape: 2
- no-octal: 2
- no-proto: 2
- no-redeclare: 2
- no-return-assign: 2
- no-script-url: 2
- no-self-compare: 2
- no-sequences: 2
- no-throw-literal: 0
- no-unused-expressions: 2
- no-useless-call: 2
- no-useless-concat: 2
- no-void: 2
- no-warning-comments: 0
- no-with: 2
- radix: 2
- vars-on-top: 0
- wrap-iife: 2
- yoda: [1, never]
-
- # Strict
- strict: 0
-
- # Variables
- init-declarations: 0
- no-catch-shadow: 2
- no-delete-var: 2
- no-label-var: 2
- no-shadow-restricted-names: 2
- no-shadow: 2
- no-undef-init: 2
- no-undef: 2
- no-undefined: 0
- no-unused-vars: 2
- no-use-before-define: 2
-
- # Node.js and CommonJS
- callback-return: 2
- global-require: 2
- handle-callback-err: 2
- no-mixed-requires: 0
- no-new-require: 0
- no-path-concat: 2
- no-process-exit: 2
- no-restricted-modules: 0
- no-sync: 0
-
- # Stylistic Issues
- array-bracket-spacing: [2, never]
- block-spacing: 0
- brace-style: [2, 1tbs]
- camelcase: 2
- comma-dangle: [2, only-multiline]
- comma-spacing: 2
- comma-style: [2, last]
- computed-property-spacing: [2, never]
- consistent-this: [2, me]
- eol-last: 2
- func-call-spacing: 0
- func-names: [2, never]
- func-style: 0
- id-length: 0
- id-match: 0
- indent: [2, tab]
- jsx-quotes: 0
- key-spacing: 2
- keyword-spacing: 2
- linebreak-style: 0
- lines-around-comment: 0
- max-depth: 0
- max-len: 0
- max-lines: 0
- max-nested-callbacks: 0
- max-params: 0
- max-statements-per-line: 0
- max-statements: [2, 30]
- multiline-ternary: 0
- new-cap: 0
- new-parens: 2
- newline-after-var: 0
- newline-before-return: 0
- newline-per-chained-call: 0
- no-array-constructor: 0
- no-bitwise: 0
- no-continue: 0
- no-inline-comments: 0
- no-lonely-if: 2
- no-mixed-operators: 0
- no-mixed-spaces-and-tabs: 2
- no-multiple-empty-lines: [2, {max: 2}]
- no-negated-condition: 0
- no-nested-ternary: 0
- no-new-object: 0
- no-plusplus: 0
- no-restricted-syntax: 0
- no-spaced-func: 0
- no-ternary: 0
- no-trailing-spaces: 2
- no-underscore-dangle: 0
- no-unneeded-ternary: 0
- no-whitespace-before-property: 2
- object-curly-newline: 0
- object-curly-spacing: [2, never]
- object-property-newline: 0
- one-var-declaration-per-line: 2
- one-var: [2, {initialized: never}]
- operator-assignment: 0
- operator-linebreak: 0
- padded-blocks: 0
- quote-props: [2, as-needed]
- quotes: [2, single, {avoidEscape: true}]
- require-jsdoc: 0
- semi-spacing: 2
- semi: [2, always]
- sort-keys: 0
- sort-vars: 0
- space-before-blocks: [2, always]
- space-before-function-paren: [2, never]
- space-in-parens: [2, never]
- space-infix-ops: 2
- space-unary-ops: [2, {words: true, nonwords: false}]
- spaced-comment: [2, always]
- unicode-bom: 0
- wrap-regex: 2
-
- # ECMAScript 6
- arrow-body-style: 0
- arrow-parens: 0
- arrow-spacing: 0
- constructor-super: 0
- generator-star-spacing: 0
- no-arrow-condition: 0
- no-class-assign: 0
- no-const-assign: 0
- no-dupe-class-members: 0
- no-this-before-super: 0
- no-var: 0
- object-shorthand: 0
- prefer-arrow-callback: 0
- prefer-const: 0
- prefer-reflect: 0
- prefer-spread: 0
- prefer-template: 0
- require-yield: 0
diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 000000000..b0d9d5695
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1,7 @@
+extends: chartjs
+
+env:
+ browser: true
+ node: true
+
+plugins: ['html']
diff --git a/.gitignore b/.gitignore
index 53ce8fedb..0a65be9b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,11 @@
/gh-pages
/jsdoc
/node_modules
+/package-lock.json
.DS_Store
.idea
.vscode
bower.json
*.log
*.swp
+*.stackdump
diff --git a/.htmllintrc b/.htmllintrc
new file mode 100644
index 000000000..a6b209703
--- /dev/null
+++ b/.htmllintrc
@@ -0,0 +1,18 @@
+{
+ "indent-style": "tabs",
+ "attr-quote-style": "double",
+ "spec-char-escape": false,
+ "attr-bans": [
+ "align",
+ "background",
+ "bgcolor",
+ "border",
+ "frameborder",
+ "longdesc",
+ "marginwidth",
+ "marginheight",
+ "scrolling"
+ ],
+ "tag-bans": [ "b", "i" ],
+ "id-class-style": false
+}
diff --git a/.travis.yml b/.travis.yml
index 862d8b044..9b38ab3c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ script:
- gulp docs
- gulp package
- gulp bower
- - cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
+ - cat ./coverage/lcov.info | ./node_modules/.bin/coveralls || true
notifications:
slack: chartjs:pcfCZR6ugg5TEcaLtmIfQYuA
diff --git a/LICENSE.md b/LICENSE.md
index 620db307e..29c941dcc 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2013-2017 Nick Downie
+Copyright (c) 2018 Chart.js Contributors
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/README.md b/README.md
index 767950b88..f914944e1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Chart.js
-[](https://travis-ci.org/chartjs/Chart.js) [](https://codeclimate.com/github/chartjs/Chart.js) [](https://coveralls.io/github/chartjs/Chart.js?branch=master) [](https://chart-js-automation.herokuapp.com/)
+[](https://travis-ci.org/chartjs/Chart.js) [](https://coveralls.io/github/chartjs/Chart.js?branch=master) [](https://codeclimate.com/github/chartjs/Chart.js) [](https://chartjs-slack.herokuapp.com/)
*Simple HTML5 Charts using the canvas element* [chartjs.org](http://www.chartjs.org)
@@ -19,11 +19,23 @@ To install via bower:
bower install chart.js --save
```
-#### Selecting the Correct Build
+### Selecting the Correct Build
-Chart.js provides two different builds that are available for your use. The `Chart.js` and `Chart.min.js` files include Chart.js and the accompanying color parsing library. If this version is used and you require the use of the time axis, [Moment.js](http://momentjs.com/) will need to be included before Chart.js.
+Chart.js provides two different builds for you to choose: `Stand-Alone Build`, `Bundled Build`.
-The `Chart.bundle.js` and `Chart.bundle.min.js` builds include Moment.js in a single file. This version should be used if you require time axes and want a single file to include, select this version. Do not use this build if your application already includes Moment.js. If you do, Moment.js will be included twice, increasing the page load time and potentially introducing version issues.
+#### Stand-Alone Build
+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.
+
+#### Bundled Build
+Files:
+* `dist/Chart.bundle.js`
+* `dist/Chart.bundle.min.js`
+
+The bundled build includes Moment.js in a single file. You should use this version if you require time axes and want to include a single file. You should not use this build if your application already included Moment.js. Otherwise, Moment.js will be included twice which results in increasing page load time and possible version compatability issues.
## Documentation
diff --git a/book.json b/book.json
index 487fd095c..8b0f73970 100644
--- a/book.json
+++ b/book.json
@@ -1,5 +1,6 @@
{
"root": "./docs",
+ "title": "Chart.js documentation",
"author": "chartjs",
"gitbook": "3.2.2",
"plugins": ["-lunr", "-search", "search-plus", "anchorjs", "chartjs", "ga"],
diff --git a/docs/README.md b/docs/README.md
index 5a0e9f355..24ee8d499 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
# Chart.js
-[](https://chart-js-automation.herokuapp.com/)
+[](https://chartjs-slack.herokuapp.com/)
## Installation
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 606300900..8591dad86 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -7,6 +7,7 @@
* [Usage](getting-started/usage.md)
* [General](general/README.md)
* [Responsive](general/responsive.md)
+ * [Pixel Ratio](general/device-pixel-ratio.md)
* [Interactions](general/interactions/README.md)
* [Events](general/interactions/events.md)
* [Modes](general/interactions/modes.md)
diff --git a/docs/axes/README.md b/docs/axes/README.md
index b7de691ea..f65cd82d2 100644
--- a/docs/axes/README.md
+++ b/docs/axes/README.md
@@ -26,18 +26,18 @@ There are a number of config callbacks that can be used to change parameters in
| Name | Arguments | Description
| ---- | --------- | -----------
| `beforeUpdate` | `axis` | Callback called before the update process starts.
-| `beforeSetDimensions` | `axis` | Callback that runs before dimensions are set.
+| `beforeSetDimensions` | `axis` | Callback that runs before dimensions are set.
| `afterSetDimensions` | `axis` | Callback that runs after dimensions are set.
| `beforeDataLimits` | `axis` | Callback that runs before data limits are determined.
| `afterDataLimits` | `axis` | Callback that runs after data limits are determined.
| `beforeBuildTicks` | `axis` | Callback that runs before ticks are created.
| `afterBuildTicks` | `axis` | Callback that runs after ticks are created. Useful for filtering ticks.
| `beforeTickToLabelConversion` | `axis` | Callback that runs before ticks are converted into strings.
-| `afterTickToLabelConversion` | `axis` | Callback that runs after ticks are converted into strings.
+| `afterTickToLabelConversion` | `axis` | Callback that runs after ticks are converted into strings.
| `beforeCalculateTickRotation` | `axis` | Callback that runs before tick rotation is determined.
| `afterCalculateTickRotation` | `axis` | Callback that runs after tick rotation is determined.
-| `beforeFit` | `axis` | Callback that runs before the scale fits to the canvas.
-| `afterFit` | `axis` | Callback that runs after the scale fits to the canvas.
+| `beforeFit` | `axis` | Callback that runs before the scale fits to the canvas.
+| `afterFit` | `axis` | Callback that runs after the scale fits to the canvas.
| `afterUpdate` | `axis` | Callback that runs at the end of the update process.
## Updating Axis Defaults
diff --git a/docs/axes/cartesian/README.md b/docs/axes/cartesian/README.md
index 64ce32073..8518da9f2 100644
--- a/docs/axes/cartesian/README.md
+++ b/docs/axes/cartesian/README.md
@@ -75,13 +75,13 @@ var myChart = new Chart(ctx, {
data: {
datasets: [{
data: [20, 50, 100, 75, 25, 0],
- label: 'Left dataset'
+ label: 'Left dataset',
// This binds the dataset to the left y axis
yAxisID: 'left-y-axis'
}, {
- data: [0.1, 0.5, 1.0, 2.0, 1.5, 0]
- label: 'Right dataset'
+ data: [0.1, 0.5, 1.0, 2.0, 1.5, 0],
+ label: 'Right dataset',
// This binds the dataset to the right y axis
yAxisID: 'right-y-axis',
diff --git a/docs/axes/cartesian/linear.md b/docs/axes/cartesian/linear.md
index 00f7aced1..1d0292074 100644
--- a/docs/axes/cartesian/linear.md
+++ b/docs/axes/cartesian/linear.md
@@ -20,7 +20,7 @@ The following options are provided by the linear scale. They are all located in
Given the number of axis range settings, it is important to understand how they all interact with each other.
-The `suggestedMax` and `suggestedMin` settings only change the data values that are used to scale the axis. These are useful for extending the range of the axis while maintaing the auto fit behaviour.
+The `suggestedMax` and `suggestedMin` settings only change the data values that are used to scale the axis. These are useful for extending the range of the axis while maintaining the auto fit behaviour.
```javascript
let minDataValue = Math.min(mostNegativeValue, options.ticks.suggestedMin);
@@ -43,7 +43,7 @@ let chart = new Chart(ctx, {
scales: {
yAxes: [{
ticks: {
- suggestedMin: 50
+ suggestedMin: 50,
suggestedMax: 100
}
}]
diff --git a/docs/axes/cartesian/time.md b/docs/axes/cartesian/time.md
index 9d15b5e26..cefe9c248 100644
--- a/docs/axes/cartesian/time.md
+++ b/docs/axes/cartesian/time.md
@@ -147,6 +147,6 @@ The `ticks.source` property controls the ticks generation
* `'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 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.
diff --git a/docs/axes/radial/linear.md b/docs/axes/radial/linear.md
index 1636781a8..14009be6a 100644
--- a/docs/axes/radial/linear.md
+++ b/docs/axes/radial/linear.md
@@ -36,7 +36,7 @@ The following options are provided by the linear scale. They are all located in
Given the number of axis range settings, it is important to understand how they all interact with each other.
-The `suggestedMax` and `suggestedMin` settings only change the data values that are used to scale the axis. These are useful for extending the range of the axis while maintaing the auto fit behaviour.
+The `suggestedMax` and `suggestedMin` settings only change the data values that are used to scale the axis. These are useful for extending the range of the axis while maintaining the auto fit behaviour.
```javascript
let minDataValue = Math.min(mostNegativeValue, options.ticks.suggestedMin);
@@ -58,7 +58,7 @@ let chart = new Chart(ctx, {
options: {
scale: {
ticks: {
- suggestedMin: 50
+ suggestedMin: 50,
suggestedMax: 100
}
}
@@ -104,7 +104,7 @@ The following options are used to configure the point labels that are shown on t
| Name | Type | Default | Description
| -----| ---- | --------| -----------
| `callback` | `Function` | | Callback function to transform data labels to point labels. The default implementation simply returns the current string.
-| `fontColor` | `Color` | `'#666'` | Font color for point labels.
+| `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
| `fontStyle` | `String` | `'normal'` | Font style to use when rendering point labels.
diff --git a/docs/axes/styling.md b/docs/axes/styling.md
index 1de31e01f..f60afd9bb 100644
--- a/docs/axes/styling.md
+++ b/docs/axes/styling.md
@@ -35,8 +35,8 @@ The tick configuration is nested under the scale configuration in the `ticks` ke
| `fontSize` | `Number` | `12` | Font size for the tick labels.
| `fontStyle` | `String` | `'normal'` | Font style for the tick labels, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
| `reverse` | `Boolean` | `false` | Reverses order of tick labels.
-| `minor` | `object` | `{}` | Minor ticks configuration. Ommited options are inherited from options above.
-| `major` | `object` | `{}` | Major ticks configuration. Ommited options are inherited from options above.
+| `minor` | `object` | `{}` | Minor ticks configuration. Omitted options are inherited from options above.
+| `major` | `object` | `{}` | Major ticks configuration. Omitted options are inherited from options above.
## Minor Tick Configuration
The minorTick configuration is nested under the ticks configuration in the `minor` key. It defines options for the minor tick marks that are generated by the axis. Omitted options are inherited from `ticks` configuration.
diff --git a/docs/charts/bar.md b/docs/charts/bar.md
index cd5e8c9f3..84704ba94 100644
--- a/docs/charts/bar.md
+++ b/docs/charts/bar.md
@@ -6,12 +6,12 @@ A bar chart provides a way of showing data values represented as vertical bars.
"type": "bar",
"data": {
"labels": [
- "January",
- "February",
- "March",
- "April",
- "May",
- "June",
+ "January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
"July"
],
"datasets": [{
@@ -152,7 +152,7 @@ The `data` property of a dataset for a bar chart is specified as a an array of n
data: [20, 10]
```
-You can also specify the dataset as x/y coordinates when using the [time scale](./time.md).
+You can also specify the dataset as x/y coordinates when using the [time scale](../axes/cartesian/time.md#time-cartesian-axis).
```javascript
data: [{x:'2016-12-25', y:20}, {x:'2016-12-26', y:10}]
diff --git a/docs/charts/doughnut.md b/docs/charts/doughnut.md
index 35a7dbb56..cd9af9d56 100644
--- a/docs/charts/doughnut.md
+++ b/docs/charts/doughnut.md
@@ -55,7 +55,6 @@ The doughnut/pie chart allows a number of properties to be specified for each da
| Name | Type | Description
| ---- | ---- | -----------
-| `label` | `String` | The label for the dataset which appears in the legend and tooltips.
| `backgroundColor` | `Color[]` | The fill color of the arcs in the dataset. See [Colors](../general/colors.md#colors)
| `borderColor` | `Color[]` | The border color of the arcs in the dataset. See [Colors](../general/colors.md#colors)
| `borderWidth` | `Number[]` | The border width of the arcs in the dataset.
diff --git a/docs/charts/line.md b/docs/charts/line.md
index 40441b7af..90471e462 100644
--- a/docs/charts/line.md
+++ b/docs/charts/line.md
@@ -119,7 +119,7 @@ The `data` property of a dataset for a line chart can be passed in two formats.
data: [20, 10]
```
-When the `data` array is an array of numbers, the x axis is generally a [category](../axes/cartesian/category.md#Category Axis). The points are placed onto the axis using their position in the array. When a line chart is created with a category axis, the `labels` property of the data object must be specified.
+When the `data` array is an array of numbers, the x axis is generally a [category](../axes/cartesian/category.md#category-cartesian-axis). The points are placed onto the axis using their position in the array. When a line chart is created with a category axis, the `labels` property of the data object must be specified.
### Point[]
diff --git a/docs/charts/mixed.md b/docs/charts/mixed.md
index e7f43a219..9a51eae86 100644
--- a/docs/charts/mixed.md
+++ b/docs/charts/mixed.md
@@ -41,9 +41,9 @@ At this point we have a chart rendering how we'd like. It's important to note th
"type": "bar",
"data": {
"labels": [
- "January",
- "February",
- "March",
+ "January",
+ "February",
+ "March",
"April"
],
"datasets": [{
diff --git a/docs/charts/polar.md b/docs/charts/polar.md
index 29952cff6..8f403149e 100644
--- a/docs/charts/polar.md
+++ b/docs/charts/polar.md
@@ -46,7 +46,6 @@ The following options can be included in a polar area chart dataset to configure
| Name | Type | Description
| ---- | ---- | -----------
-| `label` | `String` | The label for the dataset which appears in the legend and tooltips.
| `backgroundColor` | `Color[]` | The fill color of the arcs in the dataset. See [Colors](../general/colors.md#colors)
| `borderColor` | `Color[]` | The border color of the arcs in the dataset. See [Colors](../general/colors.md#colors)
| `borderWidth` | `Number[]` | The border width of the arcs in the dataset.
diff --git a/docs/charts/radar.md b/docs/charts/radar.md
index ac908315c..b8a41c838 100644
--- a/docs/charts/radar.md
+++ b/docs/charts/radar.md
@@ -8,9 +8,9 @@ They are often useful for comparing the points of two or more different data set
"type": "radar",
"data": {
"labels": [
- "Eating",
- "Drinking",
- "Sleeping",
+ "Eating",
+ "Drinking",
+ "Sleeping",
"Designing",
"Coding",
"Cycling",
@@ -94,7 +94,7 @@ The style of point. Options are:
* 'circle'
* 'cross'
* 'crossRot'
-* 'dash'.
+* 'dash'.
* 'line'
* 'rect'
* 'rectRounded'
@@ -127,7 +127,7 @@ It is common to want to apply a configuration setting to all created radar chart
## Data Structure
-The `data` property of a dataset for a radar chart is specified as a an array of numbers. Each point in the data array corresponds to the label at the same index on the x axis.
+The `data` property of a dataset for a radar chart is specified as a an array of numbers. Each point in the data array corresponds to the label at the same index on the x axis.
```javascript
data: [20, 10]
diff --git a/docs/configuration/legend.md b/docs/configuration/legend.md
index bce69af79..6867b762d 100644
--- a/docs/configuration/legend.md
+++ b/docs/configuration/legend.md
@@ -10,7 +10,7 @@ The legend configuration is passed into the `options.legend` namespace. The glob
| `display` | `Boolean` | `true` | is the legend shown
| `position` | `String` | `'top'` | Position of the legend. [more...](#position)
| `fullWidth` | `Boolean` | `true` | Marks that this box should take the full width of the canvas (pushing down other boxes). This is unlikely to need to be changed in day-to-day use.
-| `onClick` | `Function` | | A callback that is called when a click event is registered on a label item
+| `onClick` | `Function` | | A callback that is called when a click event is registered on a label item
| `onHover` | `Function` | | A callback that is called when a 'mousemove' event is registered on top of a label item
| `reverse` | `Boolean` | `false` | Legend will show datasets in reverse order.
| `labels` | `Object` | | See the [Legend Label Configuration](#legend-label-configuration) section below.
@@ -164,3 +164,7 @@ var chart = new Chart(ctx, {
}
});
```
+
+Note that legendCallback is not called automatically and you must call `generateLegend()` yourself in code when creating a legend using this method.
+
+
diff --git a/docs/configuration/tooltip.md b/docs/configuration/tooltip.md
index 51004843a..b591dc1d1 100644
--- a/docs/configuration/tooltip.md
+++ b/docs/configuration/tooltip.md
@@ -6,7 +6,7 @@ The tooltip configuration is passed into the `options.tooltips` namespace. The g
| Name | Type | Default | Description
| -----| ---- | --------| -----------
-| `enabled` | `Boolean` | `true` | Are tooltips enabled
+| `enabled` | `Boolean` | `true` | Are on-canvas tooltips enabled
| `custom` | `Function` | `null` | See [custom tooltip](#external-custom-tooltips) section.
| `mode` | `String` | `'nearest'` | Sets which elements appear in the tooltip. [more...](../general/interactions/modes.md#interaction-modes).
| `intersect` | `Boolean` | `true` | if true, the tooltip mode applies only when the mouse position intersects with an element. If false, the mode will be applied at all times.
@@ -30,7 +30,7 @@ The tooltip configuration is passed into the `options.tooltips` namespace. The g
| `footerFontSize` | `Number` | `12` | Footer font size
| `footerFontStyle` | `String` | `'bold'` | Footer font style
| `footerFontColor` | `Color` | `'#fff'` | Footer font color
-| `footerSpacing` | `Number` | `2` | Spacing to add to top and bottom of each fotter line.
+| `footerSpacing` | `Number` | `2` | Spacing to add to top and bottom of each footer line.
| `footerMarginTop` | `Number` | `6` | Margin to add before drawing the footer.
| `xPadding` | `Number` | `6` | Padding to add on left and right of tooltip.
| `yPadding` | `Number` | `6` | Padding to add on top and bottom of tooltip.
@@ -63,9 +63,9 @@ Example:
Chart.Tooltip.positioners.custom = function(elements, eventPosition) {
/** @type {Chart.Tooltip} */
var tooltip = this;
-
+
/* ... */
-
+
return {
x: 0,
y: 0
@@ -103,6 +103,32 @@ All functions are called with the same arguments: a [tooltip item](#tooltip-item
| `footer` | `Array[tooltipItem], data` | Returns text to render as the footer of the tooltip.
| `afterFooter` | `Array[tooltipItem], data` | Text to render after the footer section
+### Label Callback
+
+The label callback can change the text that displays for a given data point. A common example to round data values; the following example rounds the data to two decimal places.
+
+```javascript
+var chart = new Chart(ctx, {
+ type: 'line',
+ data: data,
+ options: {
+ tooltips: {
+ callbacks: {
+ label: function(tooltipItem, data) {
+ var label = data.datasets[tooltipItem.datasetIndex].label || '';
+
+ if (label) {
+ label += ': ';
+ }
+ label += Math.round(tooltipItem.yLabel * 100) / 100;
+ return label;
+ }
+ }
+ }
+ }
+});
+```
+
### Label Color Callback
For example, to return a red box for each item in the tooltip you could do:
@@ -165,6 +191,9 @@ var myPieChart = new Chart(ctx, {
data: data,
options: {
tooltips: {
+ // Disable the on-canvas tooltip
+ enabled: false,
+
custom: function(tooltipModel) {
// Tooltip Element
var tooltipEl = document.getElementById('chartjs-tooltip');
@@ -173,7 +202,7 @@ var myPieChart = new Chart(ctx, {
if (!tooltipEl) {
tooltipEl = document.createElement('div');
tooltipEl.id = 'chartjs-tooltip';
- tooltipEl.innerHTML = "
"
+ tooltipEl.innerHTML = "
";
document.body.appendChild(tooltipEl);
}
@@ -212,7 +241,7 @@ var myPieChart = new Chart(ctx, {
var style = 'background:' + colors.backgroundColor;
style += '; border-color:' + colors.borderColor;
style += '; border-width: 2px';
- var span = '';
+ var span = '';
innerHtml += '
' + span + body + '
';
});
innerHtml += '';
@@ -226,11 +255,12 @@ var myPieChart = new Chart(ctx, {
// Display, position, and set styles for font
tooltipEl.style.opacity = 1;
+ tooltipEl.style.position = 'absolute';
tooltipEl.style.left = position.left + tooltipModel.caretX + 'px';
tooltipEl.style.top = position.top + tooltipModel.caretY + 'px';
- tooltipEl.style.fontFamily = tooltipModel._fontFamily;
- tooltipEl.style.fontSize = tooltipModel.fontSize;
- tooltipEl.style.fontStyle = tooltipModel._fontStyle;
+ tooltipEl.style.fontFamily = tooltipModel._bodyFontFamily;
+ tooltipEl.style.fontSize = tooltipModel.bodyFontSize + 'px';
+ tooltipEl.style.fontStyle = tooltipModel._bodyFontStyle;
tooltipEl.style.padding = tooltipModel.yPadding + 'px ' + tooltipModel.xPadding + 'px';
}
}
@@ -238,7 +268,7 @@ var myPieChart = new Chart(ctx, {
});
```
-See `samples/tooltips/line-customTooltips.html` for examples on how to get started.
+See [samples](http://www.chartjs.org/samples/) for examples on how to get started with custom tooltips.
## Tooltip Model
The tooltip model contains parameters that can be used to render the tooltip.
diff --git a/docs/developers/api.md b/docs/developers/api.md
index a5a0a5133..976578d57 100644
--- a/docs/developers/api.md
+++ b/docs/developers/api.md
@@ -132,9 +132,9 @@ To get an item that was clicked on, `getElementAtEvent` can be used.
```javascript
function clickHandler(evt) {
- var item = myChart.getElementAtEvent(evt)[0];
+ var firstPoint = myChart.getElementAtEvent(evt)[0];
- if (item) {
+ if (firstPoint) {
var label = myChart.data.labels[firstPoint._index];
var value = myChart.data.datasets[firstPoint._datasetIndex].data[firstPoint._index];
}
diff --git a/docs/developers/axes.md b/docs/developers/axes.md
index 8d120195a..7d6c74e32 100644
--- a/docs/developers/axes.md
+++ b/docs/developers/axes.md
@@ -78,14 +78,14 @@ To work with Chart.js, custom scale types must implement the following interface
// Get the pixel (x coordinate for horizontal axis, y coordinate for vertical axis) for a given value
// @param index: index into the ticks array
- // @param includeOffset: if true, get the pixel halway between the given tick and the next
+ // @param includeOffset: if true, get the pixel halfway between the given tick and the next
getPixelForTick: function(index, includeOffset) {},
// Get the pixel (x coordinate for horizontal axis, y coordinate for vertical axis) for a given value
// @param value : the value to get the pixel for
// @param index : index into the data array of the value
// @param datasetIndex : index of the dataset the value comes from
- // @param includeOffset : if true, get the pixel halway between the given tick and the next
+ // @param includeOffset : if true, get the pixel halfway between the given tick and the next
getPixelForValue: function(value, index, datasetIndex, includeOffset) {}
// Get the value for a given pixel (x coordinate for horizontal axis, y coordinate for vertical axis)
diff --git a/docs/developers/charts.md b/docs/developers/charts.md
index f4c9a9746..e1267423b 100644
--- a/docs/developers/charts.md
+++ b/docs/developers/charts.md
@@ -75,7 +75,7 @@ The built in controller types are:
For example, to derive a new chart type that extends from a bubble chart, you would do the following.
```javascript
-// Sets the default config for 'derivedBubble' to be the same as the bubble defaults.
+// Sets the default config for 'derivedBubble' to be the same as the bubble defaults.
// We look for the defaults by doing Chart.defaults[chartType]
// It looks like a bug exists when the defaults don't exist
Chart.defaults.derivedBubble = Chart.defaults.bubble;
@@ -102,7 +102,7 @@ var custom = Chart.controllers.bubble.extend({
// Stores the controller so that the chart initialization routine can look it up with
// Chart.controllers[type]
-Chart.controllers.derivedBubble = custom;
+Chart.controllers.derivedBubble = custom;
// Now we can create and use our new chart type
new Chart(ctx, {
diff --git a/docs/developers/contributing.md b/docs/developers/contributing.md
index e6551d590..fa3511bb0 100644
--- a/docs/developers/contributing.md
+++ b/docs/developers/contributing.md
@@ -12,7 +12,7 @@ New contributions to the library are welcome, but we ask that you please follow
# Joining the project
- Active committers and contributors are invited to introduce yourself and request commit access to this project. We have a very active Slack community that you can join [here](https://chart-js-automation.herokuapp.com/). If you think you can help, we'd love to have you!
+ Active committers and contributors are invited to introduce yourself and request commit access to this project. We have a very active Slack community that you can join [here](https://chartjs-slack.herokuapp.com/). If you think you can help, we'd love to have you!
# Building and Testing
diff --git a/docs/developers/updates.md b/docs/developers/updates.md
index 06550ce0c..b65757f85 100644
--- a/docs/developers/updates.md
+++ b/docs/developers/updates.md
@@ -1,6 +1,6 @@
# Updating Charts
-It's pretty common to want to update charts after they've been created. When the chart data is changed, Chart.js will animate to the new data values.
+It's pretty common to want to update charts after they've been created. When the chart data or options are changed, Chart.js will animate to the new data values and options.
## Adding or Removing Data
@@ -14,9 +14,7 @@ function addData(chart, label, data) {
});
chart.update();
}
-```
-```javascript
function removeData(chart) {
chart.data.labels.pop();
chart.data.datasets.forEach((dataset) => {
@@ -26,6 +24,78 @@ function removeData(chart) {
}
```
+## Updating Options
+
+To update the options, mutating the options property in place or passing in a new options object are supported.
+
+- If the options are mutated in place, other option properties would be preserved, including those calculated by Chart.js.
+- If created as a new object, it would be like creating a new chart with the options - old options would be discarded.
+
+```javascript
+function updateConfigByMutating(chart) {
+ chart.options.title.text = 'new title';
+ chart.update();
+}
+
+function updateConfigAsNewObject(chart) {
+ chart.options = {
+ responsive: true,
+ title:{
+ display:true,
+ text: 'Chart.js'
+ },
+ scales: {
+ xAxes: [{
+ display: true
+ }],
+ yAxes: [{
+ display: true
+ }]
+ }
+ }
+ chart.update();
+}
+```
+
+Scales can be updated separately without changing other options.
+To update the scales, pass in an object containing all the customization including those unchanged ones.
+
+Variables referencing any one from `chart.scales` would be lost after updating scales with a new `id` or the changed `type`.
+
+```javascript
+function updateScales(chart) {
+ var xScale = chart.scales['x-axis-0'];
+ var yScale = chart.scales['y-axis-0'];
+ chart.options.scales = {
+ xAxes: [{
+ id: 'newId',
+ display: true
+ }],
+ yAxes: [{
+ display: true,
+ type: 'logarithmic'
+ }]
+ }
+ chart.update();
+ // need to update the reference
+ xScale = chart.scales['newId'];
+ yScale = chart.scales['y-axis-0'];
+}
+```
+
+You can also update a specific scale either by specifying its index or id.
+
+```javascript
+function updateScale(chart) {
+ chart.options.scales.yAxes[0] = {
+ type: 'logarithmic'
+ }
+ chart.update();
+}
+```
+
+Code sample for updating options can be found in [toggle-scale-type.html](../../samples/scales/toggle-scale-type.html).
+
## Preventing Animations
Sometimes when a chart updates, you may not want an animation. To achieve this you can call `update` with a duration of `0`. This will render the chart synchronously and without an animation.
\ No newline at end of file
diff --git a/docs/general/colors.md b/docs/general/colors.md
index d2d270081..64ab84c66 100644
--- a/docs/general/colors.md
+++ b/docs/general/colors.md
@@ -6,7 +6,7 @@ You can also pass a [CanvasGradient](https://developer.mozilla.org/en-US/docs/We
## Patterns and Gradients
-An alternative option is to pass a [CanvasPattern](https://developer.mozilla.org/en-US/docs/Web/API/CanvasPattern) or [CanvasGradient](https://developer.mozilla.org/en/docs/Web/API/CanvasGradient) object instead of a string colour.
+An alternative option is to pass a [CanvasPattern](https://developer.mozilla.org/en-US/docs/Web/API/CanvasPattern) or [CanvasGradient](https://developer.mozilla.org/en/docs/Web/API/CanvasGradient) object instead of a string colour.
For example, if you wanted to fill a dataset with a pattern from an image you could do the following.
diff --git a/docs/general/interactions/README.md b/docs/general/interactions/README.md
index 585e65582..532cab6f0 100644
--- a/docs/general/interactions/README.md
+++ b/docs/general/interactions/README.md
@@ -1,6 +1,6 @@
# Interactions
-The hover configuration is passed into the `options.hover` namespace. The global hover configuration is at `Chart.defaults.global.hover`. To configure which events trigger chart interactions, see [events](./events.md#events).
+The hover configuration is passed into the `options.hover` namespace. The global hover configuration is at `Chart.defaults.global.hover`. To configure which events trigger chart interactions, see [events](./events.md#events).
| Name | Type | Default | Description
| ---- | ---- | ------- | -----------
diff --git a/docs/general/interactions/events.md b/docs/general/interactions/events.md
index 8e21f7502..d5d05138c 100644
--- a/docs/general/interactions/events.md
+++ b/docs/general/interactions/events.md
@@ -7,7 +7,7 @@ The following properties define how the chart interacts with events.
| `onHover` | `Function` | `null` | Called when any of the events fire. Called in the context of the chart and passed the event and an array of active elements (bars, points, etc).
| `onClick` | `Function` | `null` | Called if the event is of type 'mouseup' or 'click'. Called in the context of the chart and passed the event and an array of active elements
-## Event Option
+## Event Option
For example, to have the chart only respond to click events, you could do
```javascript
var chart = new Chart(ctx, {
diff --git a/docs/general/interactions/modes.md b/docs/general/interactions/modes.md
index a46f047e7..3e9f7982f 100644
--- a/docs/general/interactions/modes.md
+++ b/docs/general/interactions/modes.md
@@ -41,7 +41,7 @@ Finds the first item that intersects the point and returns it. Behaves like 'nea
See `'index'` mode
## index
-Finds item at the same index. If the `intersect` setting is true, the first intersecting item is used to determine the index in the data. If `intersect` false the nearest item, in the x direction, is used to determine the index.
+Finds item at the same index. If the `intersect` setting is true, the first intersecting item is used to determine the index in the data. If `intersect` false the nearest item, in the x direction, is used to determine the index.
```javascript
var chart = new Chart(ctx, {
diff --git a/docs/general/responsive.md b/docs/general/responsive.md
index bf8e8fa7a..f410826b8 100644
--- a/docs/general/responsive.md
+++ b/docs/general/responsive.md
@@ -33,3 +33,15 @@ The chart can also be programmatically resized by modifying the container size:
```javascript
chart.canvas.parentNode.style.height = '128px';
```
+
+## Printing Resizeable Charts
+
+CSS media queries allow changing styles when printing a page. The CSS applied from these media queries may cause charts to need to resize. However, the resize won't happen automatically. To support resizing charts when printing, one needs to hook the [onbeforeprint](https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onbeforeprint) event and manually trigger resizing of each chart.
+
+```javascript
+function beforePrintHandler () {
+ for (var id in Chart.instances) {
+ Chart.instances[id].resize()
+ }
+}
+```
diff --git a/docs/getting-started/README.md b/docs/getting-started/README.md
index 9266b3099..bff52c72d 100644
--- a/docs/getting-started/README.md
+++ b/docs/getting-started/README.md
@@ -40,4 +40,4 @@ var chart = new Chart(ctx, {
It's that easy to get started using Chart.js! From here you can explore the many options that can help you customise your charts with scales, tooltips, labels, colors, custom actions, and much more.
-There are many examples of Chart.js that are available in the `/samples` folder of `Chart.js.zip` that is attatched to every [release](https://github.com/chartjs/Chart.js/releases).
\ No newline at end of file
+There are many examples of Chart.js that are available in the `/samples` folder of `Chart.js.zip` that is attached to every [release](https://github.com/chartjs/Chart.js/releases).
\ No newline at end of file
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index c8291d260..ccc02ddc4 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -36,22 +36,22 @@ https://www.jsdelivr.com/package/npm/chart.js?path=dist
You can download the latest version of [Chart.js on GitHub](https://github.com/chartjs/Chart.js/releases/latest).
-If you download or clone the repository, you must [build](../developers/contributing.md#building-chartjs) Chart.js to generate the dist files. Chart.js no longer comes with prebuilt release versions, so an alternative option to downloading the repo is **strongly** advised.
+If you download or clone the repository, you must [build](../developers/contributing.md#building-and-testing) Chart.js to generate the dist files. Chart.js no longer comes with prebuilt release versions, so an alternative option to downloading the repo is **strongly** advised.
# Selecting the Correct Build
-Chart.js provides two different builds that are available for your use.
+Chart.js provides two different builds for you to choose: `Stand-Alone Build`, `Bundled Build`.
## Stand-Alone Build
Files:
* `dist/Chart.js`
* `dist/Chart.min.js`
-This version only includes Chart.js. If this version is used and you require the use of the time axis, [Moment.js](http://momentjs.com/) will need to be included before Chart.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.
## Bundled Build
Files:
* `dist/Chart.bundle.js`
* `dist/Chart.bundle.min.js`
-The bundled version includes Moment.js built into the same file. This version should be used if you wish to use time axes and want a single file to include. Do not use this build if your application already includes Moment.js. If you do, Moment.js will be included twice, increasing the page load time and potentially introducing version issues.
+The bundled build includes Moment.js in a single file. You should use this version if you require time axes and want to include a single file. You should not use this build if your application already included Moment.js. Otherwise, Moment.js will be included twice which results in increasing page load time and possible version compatability issues.
diff --git a/docs/notes/extensions.md b/docs/notes/extensions.md
index 33e0e647e..fe2c337f1 100644
--- a/docs/notes/extensions.md
+++ b/docs/notes/extensions.md
@@ -18,13 +18,19 @@ In addition, many charts can be found on the [npm registry](https://www.npmjs.co
- chartjs-plugin-deferred - Defers initial chart update until chart scrolls into viewport.
- chartjs-plugin-draggable - Makes select chart elements draggable with the mouse.
- chartjs-plugin-stacked100 - Draws 100% stacked bar chart.
+ - chartjs-plugin-waterfall - Enables easy use of waterfall charts.
- chartjs-plugin-zoom - Enables zooming and panning on charts.
In addition, many plugins can be found on the [npm registry](https://www.npmjs.com/search?q=chartjs-plugin-).
## Integrations
-### Angular
+### Angular (v2+)
+
+ - emn178/angular2-chartjs
+ - valor-software/ng2-charts
+
+### Angular (v1)
- angular-chart.js
- tc-angular-chartjs
- angular-chartjs
@@ -49,3 +55,9 @@ In addition, many plugins can be found on the [npm registry](https://www.npmjs.c
### Java
- Chart.java
+
+### GWT (Google Web toolkit)
+ - Charba
+
+### Ember.js
+ - ember-cli-chart
diff --git a/gulpfile.js b/gulpfile.js
index bb42ea9d3..21f19645f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,7 +3,6 @@ var concat = require('gulp-concat');
var connect = require('gulp-connect');
var eslint = require('gulp-eslint');
var file = require('gulp-file');
-var htmlv = require('gulp-html-validator');
var insert = require('gulp-insert');
var replace = require('gulp-replace');
var size = require('gulp-size');
@@ -17,10 +16,18 @@ var browserify = require('browserify');
var source = require('vinyl-source-stream');
var merge = require('merge-stream');
var collapse = require('bundle-collapser/plugin');
-var argv = require('yargs').argv
+var yargs = require('yargs');
var path = require('path');
+var fs = require('fs');
+var htmllint = require('gulp-htmllint');
var package = require('./package.json');
+var argv = yargs
+ .option('force-output', {default: false})
+ .option('silent-errors', {default: false})
+ .option('verbose', {default: false})
+ .argv
+
var srcDir = './src/';
var outDir = './dist/';
@@ -29,21 +36,26 @@ var header = "/*!\n" +
" * http://chartjs.org/\n" +
" * Version: {{ version }}\n" +
" *\n" +
- " * Copyright 2017 Nick Downie\n" +
+ " * Copyright " + (new Date().getFullYear()) + " Chart.js Contributors\n" +
" * Released under the MIT license\n" +
" * https://github.com/chartjs/Chart.js/blob/master/LICENSE.md\n" +
" */\n";
+if (argv.verbose) {
+ util.log("Gulp running with options: " + JSON.stringify(argv, null, 2));
+}
+
gulp.task('bower', bowerTask);
gulp.task('build', buildTask);
gulp.task('package', packageTask);
gulp.task('watch', watchTask);
-gulp.task('lint', lintTask);
+gulp.task('lint', ['lint-html', 'lint-js']);
+gulp.task('lint-html', lintHtmlTask);
+gulp.task('lint-js', lintJsTask);
gulp.task('docs', docsTask);
-gulp.task('test', ['lint', 'validHTML', 'unittest']);
+gulp.task('test', ['lint', 'unittest']);
gulp.task('size', ['library-size', 'module-sizes']);
gulp.task('server', serverTask);
-gulp.task('validHTML', validHTMLTask);
gulp.task('unittest', unittestTask);
gulp.task('library-size', librarySizeTask);
gulp.task('module-sizes', moduleSizesTask);
@@ -79,9 +91,25 @@ function bowerTask() {
function buildTask() {
+ var errorHandler = function (err) {
+ if(argv.forceOutput) {
+ var browserError = 'console.error("Gulp: ' + err.toString() + '")';
+ ['Chart', 'Chart.min', 'Chart.bundle', 'Chart.bundle.min'].forEach(function(fileName) {
+ fs.writeFileSync(outDir+fileName+'.js', browserError);
+ });
+ }
+ if(argv.silentErrors) {
+ util.log(util.colors.red('[Error]'), err.toString());
+ this.emit('end');
+ } else {
+ throw err;
+ }
+ }
+
var bundled = browserify('./src/chart.js', { standalone: 'Chart' })
.plugin(collapse)
.bundle()
+ .on('error', errorHandler)
.pipe(source('Chart.bundle.js'))
.pipe(insert.prepend(header))
.pipe(streamify(replace('{{ version }}', package.version)))
@@ -96,6 +124,7 @@ function buildTask() {
.ignore('moment')
.plugin(collapse)
.bundle()
+ .on('error', errorHandler)
.pipe(source('Chart.js'))
.pipe(insert.prepend(header))
.pipe(streamify(replace('{{ version }}', package.version)))
@@ -125,8 +154,9 @@ function packageTask() {
.pipe(gulp.dest(outDir));
}
-function lintTask() {
+function lintJsTask() {
var files = [
+ 'samples/**/*.html',
'samples/**/*.js',
'src/**/*.js',
'test/**/*.js'
@@ -148,6 +178,13 @@ function lintTask() {
.pipe(eslint.failAfterError());
}
+function lintHtmlTask() {
+ return gulp.src('samples/**/*.html')
+ .pipe(htmllint({
+ failOnError: true,
+ }));
+}
+
function docsTask(done) {
const script = require.resolve('gitbook-cli/bin/gitbook.js');
const cmd = process.execPath;
@@ -161,11 +198,6 @@ function docsTask(done) {
});
}
-function validHTMLTask() {
- return gulp.src('samples/*.html')
- .pipe(htmlv());
-}
-
function startTest() {
return [
{pattern: './test/fixtures/**/*.json', included: false},
diff --git a/package.json b/package.json
index a7a504887..a2e6c494a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "chart.js",
"homepage": "http://www.chartjs.org",
"description": "Simple HTML5 charts using the canvas element.",
- "version": "2.7.1",
+ "version": "2.7.2",
"license": "MIT",
"main": "src/chart.js",
"repository": {
@@ -10,30 +10,33 @@
"url": "https://github.com/chartjs/Chart.js.git"
},
"devDependencies": {
- "browserify": "^14.3.0",
- "browserify-istanbul": "^2.0.0",
- "bundle-collapser": "^1.2.1",
+ "browserify": "^14.5.0",
+ "browserify-istanbul": "^3.0.1",
+ "bundle-collapser": "^1.3.0",
"child-process-promise": "^2.2.1",
- "coveralls": "^2.13.1",
- "gitbook-cli": "^2.3.0",
+ "coveralls": "^3.0.0",
+ "eslint": "^4.9.0",
+ "eslint-config-chartjs": "^0.1.0",
+ "eslint-plugin-html": "^4.0.2",
+ "gitbook-cli": "^2.3.2",
"gulp": "3.9.x",
"gulp-concat": "~2.6.x",
"gulp-connect": "~5.0.0",
- "gulp-eslint": "^3.0.1",
+ "gulp-eslint": "^4.0.0",
"gulp-file": "^0.3.0",
- "gulp-html-validator": "^0.0.5",
+ "gulp-htmllint": "^0.0.15",
"gulp-insert": "~0.5.0",
- "gulp-replace": "^0.5.4",
+ "gulp-replace": "^0.6.1",
"gulp-size": "~2.1.0",
"gulp-streamify": "^1.0.2",
"gulp-uglify": "~3.0.x",
"gulp-util": "~3.0.x",
"gulp-zip": "~4.0.0",
- "jasmine": "^2.6.0",
- "jasmine-core": "^2.6.2",
- "karma": "^1.7.0",
+ "jasmine": "^2.8.0",
+ "jasmine-core": "^2.8.0",
+ "karma": "^1.7.1",
"karma-browserify": "^5.1.1",
- "karma-chrome-launcher": "^2.1.1",
+ "karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-firefox-launcher": "^1.0.1",
"karma-jasmine": "^1.1.0",
@@ -42,13 +45,13 @@
"pixelmatch": "^4.0.2",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.9.0",
- "yargs": "^8.0.1"
+ "yargs": "^9.0.1"
},
"spm": {
"main": "Chart.js"
},
"dependencies": {
- "chartjs-color": "~2.2.0",
- "moment": "~2.18.0"
+ "chartjs-color": "^2.1.0",
+ "moment": "^2.10.2"
}
}
diff --git a/samples/.eslintrc.yml b/samples/.eslintrc.yml
new file mode 100644
index 000000000..9573adbcd
--- /dev/null
+++ b/samples/.eslintrc.yml
@@ -0,0 +1,9 @@
+globals:
+ $: true
+ Chart: true
+ Samples: true
+ moment: true
+ randomScalingFactor: true
+
+rules:
+ no-new: 0
diff --git a/samples/advanced/data-labelling.html b/samples/advanced/data-labelling.html
index 17fc47c8f..52eb07b8f 100644
--- a/samples/advanced/data-labelling.html
+++ b/samples/advanced/data-labelling.html
@@ -3,130 +3,129 @@
- Labelling Data Points
-
-
-
+ Labelling Data Points
+
+
+
-