Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 04:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Release v2.9.1 (#6618)

Browse Source 
Release v2.9.1
This commit is contained in:
Evert Timberg 2019-10-27 15:11:33 -04:00 committed by GitHub
parent 26b9d1f6ad
commit a92dd7b97f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 120 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/general/README.md
View File

@ -8,3 +8,4 @@ These sections describe general configuration options that can apply elsewhere i
* [Options](./options.md) scriptable and indexable options syntax.
* [Colors](./colors.md) defines acceptable color values.
* [Font](./fonts.md) defines various font options.
* [Performance](./performance.md) gives tips for performance-sensitive applications.

2
package.json
View File

@ -2,7 +2,7 @@
"name": "chart.js",
"homepage": "https://www.chartjs.org",
"description": "Simple HTML5 charts using the canvas element.",
"version": "2.9.0",
"version": "2.9.1",
"license": "MIT",
"jsdelivr": "dist/Chart.min.js",
"unpkg": "dist/Chart.min.js",

12
src/controllers/controller.horizontalBar.js
View File

@ -18,8 +18,6 @@ defaults._set('horizontalBar', {
yAxes: [{
type: 'category',
position: 'left',
categoryPercentage: 0.8,
barPercentage: 0.9,
offset: true,
gridLines: {
offsetGridLines: true
@ -39,6 +37,15 @@ defaults._set('horizontalBar', {
}
});
defaults._set('global', {
datasets: {
horizontalBar: {
categoryPercentage: 0.8,
barPercentage: 0.9
}
}
});
module.exports = BarController.extend({
/**
* @private
@ -54,4 +61,3 @@ module.exports = BarController.extend({
return this.getMeta().yAxisID;
}
});

3
src/controllers/controller.line.js
View File

@ -209,8 +209,9 @@ module.exports = DatasetController.extend({
if (rightValue < 0) {
return yScale.getPixelForValue(sumNeg + rightValue);
}
return yScale.getPixelForValue(sumPos + rightValue);
}
return yScale.getPixelForValue(sumPos + rightValue);
return yScale.getPixelForValue(value);
},
updateBezierControlPoints: function() {

2
src/core/core.scale.js
View File

@ -929,7 +929,7 @@ var Scale = Element.extend({
getDecimalForPixel: function(pixel) {
var decimal = (pixel - this._startPixel) / this._length;
return Math.min(1, Math.max(0, this._reversePixels ? 1 - decimal : decimal));
return this._reversePixels ? 1 - decimal : decimal;
},
/**

6
test/fixtures/controller.bar/bar-thickness-absolute.json vendored
View File

@ -5,6 +5,9 @@
"labels": ["2017", "2018", "2019", "2024", "2025"],
"datasets": [{
"backgroundColor": "rgba(255, 99, 132, 0.5)",
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": 128,
"data": [1, null, 3, 4, 5]
}]
},
@ -17,9 +20,6 @@
"type": "time",
"offset": true,
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": 128,
"time": {
"parser": "YYYY"
},

6
test/fixtures/controller.bar/bar-thickness-flex-offset.json vendored
View File

@ -5,6 +5,9 @@
"labels": ["2017", "2018", "2020", "2024", "2038"],
"datasets": [{
"backgroundColor": "#FF6384",
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": "flex",
"data": [1, null, 3, 4, 5]
}]
},
@ -17,9 +20,6 @@
"type": "time",
"offset": true,
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": "flex",
"time": {
"parser": "YYYY"
},

6
test/fixtures/controller.bar/bar-thickness-flex-single-reverse.json vendored
View File

@ -5,6 +5,9 @@
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"backgroundColor": "#FF6384",
"barThickness": "flex",
"barPercentage": 1,
"categoryPercentage": 1,
"data": [1]
}]
},
@ -16,9 +19,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barThickness": "flex",
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

6
test/fixtures/controller.bar/bar-thickness-flex-single.json vendored
View File

@ -5,6 +5,9 @@
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"backgroundColor": "#FF6384",
"barThickness": "flex",
"barPercentage": 1,
"categoryPercentage": 1,
"data": [1]
}]
},
@ -16,9 +19,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barThickness": "flex",
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

6
test/fixtures/controller.bar/bar-thickness-flex.json vendored
View File

@ -5,6 +5,9 @@
"labels": ["2017", "2018", "2020", "2024", "2038"],
"datasets": [{
"backgroundColor": "#FF6384",
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": "flex",
"data": [1, null, 3, 4, 5]
}]
},
@ -16,9 +19,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": "flex",
"time": {
"parser": "YYYY"
},

6
test/fixtures/controller.bar/bar-thickness-max.json vendored
View File

@ -5,6 +5,9 @@
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"backgroundColor": "#FF6384",
"barPercentage": 1,
"categoryPercentage": 1,
"maxBarThickness": 8,
"data": [1, null, 3, 4, 5]
}]
},
@ -16,9 +19,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"maxBarThickness": 8,
"time": {
"parser": "YYYY"
},

4
test/fixtures/controller.bar/bar-thickness-min-interval.json vendored
View File

@ -5,6 +5,8 @@
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"backgroundColor": "#FF6384",
"barPercentage": 1,
"categoryPercentage": 1,
"data": [1, null, 3, 4, 5]
}]
},
@ -16,8 +18,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

8
test/fixtures/controller.bar/bar-thickness-multiple.json vendored
View File

@ -18,12 +18,16 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

8
test/fixtures/controller.bar/bar-thickness-no-overlap.json vendored
View File

@ -18,12 +18,16 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY-MM"
},

8
test/fixtures/controller.bar/bar-thickness-offset.json vendored
View File

@ -18,13 +18,17 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"offset": true,
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

8
test/fixtures/controller.bar/bar-thickness-reverse.json vendored
View File

@ -18,12 +18,16 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

4
test/fixtures/controller.bar/bar-thickness-single-xy.json vendored
View File

@ -4,6 +4,8 @@
"data": {
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"barPercentage": 1,
"categoryPercentage": 1,
"backgroundColor": "#FF6384",
"data": [{"x": "2022", "y": 42}]
}]
@ -16,8 +18,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

4
test/fixtures/controller.bar/bar-thickness-single.json vendored
View File

@ -4,6 +4,8 @@
"data": {
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"barPercentage": 1,
"categoryPercentage": 1,
"backgroundColor": "#FF6384",
"data": [1]
}]
@ -16,8 +18,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

8
test/fixtures/controller.bar/bar-thickness-stacked.json vendored
View File

@ -18,13 +18,17 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"stacked": true,
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},

34
test/fixtures/controller.line/non-numeric-y.json vendored Normal file
View File

@ -0,0 +1,34 @@
{
"config": {
"type": "line",
"data": {
"xLabels": ["January", "February", "March", "April", "May", "June", "July"],
"yLabels": ["", "Request Added", "Request Viewed", "Request Accepted", "Request Solved", "Solving Confirmed"],
"datasets": [{
"label": "My First dataset",
"data": ["", "Request Added", "Request Added", "Request Added", "Request Viewed", "Request Viewed", "Request Viewed"],
"fill": false,
"borderColor": "red",
"backgroundColor": "red"
}]
},
"options": {
"responsive": false,
"legend": false,
"title": false,
"scales": {
"xAxes": [{"display": false}],
"yAxes": [{
"type": "category",
"display": false
}]
}
}
},
"options": {
"canvas": {
"height": 256,
"width": 512
}
}
}

BIN
test/fixtures/controller.line/non-numeric-y.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

23
test/specs/controller.bar.tests.js
View File

@ -1214,12 +1214,16 @@ describe('Chart.controllers.bar', function() {
options: {
legend: false,
title: false,
datasets: {
bar: {
barPercentage: 1,
}
},
scales: {
xAxes: [{
type: 'category',
display: false,
stacked: true,
barPercentage: 1,
}],
yAxes: [{
type: 'logarithmic',
@ -1275,12 +1279,16 @@ describe('Chart.controllers.bar', function() {
options: {
legend: false,
title: false,
datasets: {
bar: {
barPercentage: 1,
}
},
scales: {
xAxes: [{
type: 'category',
display: false,
stacked: true,
barPercentage: 1,
}],
yAxes: [{
type: 'logarithmic',
@ -1593,8 +1601,9 @@ describe('Chart.controllers.bar', function() {
var meta = chart.getDatasetMeta(0);
var yScale = chart.scales[meta.yAxisID];
var categoryPercentage = yScale.options.categoryPercentage;
var barPercentage = yScale.options.barPercentage;
var config = meta.controller._config;
var categoryPercentage = config.categoryPercentage;
var barPercentage = config.barPercentage;
var stacked = yScale.options.stacked;
var totalBarHeight = 0;
@ -1669,11 +1678,15 @@ describe('Chart.controllers.bar', function() {
options: {
legend: false,
title: false,
datasets: {
bar: {
barThickness: barThickness
}
},
scales: {
xAxes: [{
id: 'x',
type: 'category',
barThickness: barThickness
}],
yAxes: [{
type: 'linear',