Skip to content

upgrade chart.js 2.7.2 and fix #247 #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mizukami234 wants to merge 2 commits into from
Closed

upgrade chart.js 2.7.2 and fix #247 #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
018e90e
upgrade chartjs 2.7.2
mizukami234 Aug 30, 2018
2a34f12
fix cant render MixLineBar charts
mizukami234 Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"jsnext:main": "es/index.js",
"author": "Jeremy Ayerst",
"homepage": "https://github.com/jerairrest/react-chartjs-2",
"license" : "MIT" ,
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/jerairrest/react-chartjs-2.git"
Expand Down Expand Up @@ -35,7 +35,7 @@
"canvas": "^1.6.2",
"canvas-prebuilt": "^1.6.5-prerelease.1",
"chai": "^3.5.0",
"chart.js": "2.6.0",
"chart.js": "2.7.2",
"cross-env": "^5.0.0",
"css-loader": "^0.28.5",
"debug": "^2.4.1",
Expand Down
11 changes: 2 additions & 9 deletions stories/MixLineBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ const options = {
gridLines: {
display: false
},
labels: {
show: true
}
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July']
}
],
yAxes: [
Expand Down Expand Up @@ -56,7 +54,6 @@ const options = {
storiesOf('Mix Line+Bar Example', module)
.add('Line & Bar Stacked', () => {
const data = {
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
datasets: [{
label: 'Sales',
type:'line',
Expand Down Expand Up @@ -85,7 +82,6 @@ storiesOf('Mix Line+Bar Example', module)
})
.add('Line & Line Stacked', () => {
const data = {
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
datasets: [{
label: 'Sales',
type:'line',
Expand Down Expand Up @@ -114,7 +110,6 @@ storiesOf('Mix Line+Bar Example', module)
})
.add('Line & Line Past vs. Future', () => {
const data = {
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
datasets: [{
label: 'Past',
type:'line',
Expand Down Expand Up @@ -174,9 +169,7 @@ storiesOf('Mix Line+Bar Example', module)
gridLines: {
display: false
},
labels: {
show: true
}
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
}
],
yAxes: [
Expand Down