Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 20:29:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,704 Commits 8 Branches 114 Tags 67 MiB
07fae6159e
Commit Graph

282 Commits

Author SHA1 Message Date
Simon Brunel
d610987cfb Fix radar default aspect ratio and samples 
Now that the aspect ratio is correctly handled, fix samples for charts with aspect ratio of 1 which was vertically too large. Also fix the default aspect ratio for radar charts which wasn't applied when creating a chart directly using new Chart(ctx, { type: 'radar' }).
 2016-09-23 17:47:36 +02:00
Evert Timberg
89531c6b93 Merge pull request #3112 from MatthieuRivaud/MonotoneCubicInterpolation 
Monotone cubic interpolation
 2016-08-22 17:53:31 -04:00
Zach Panzarino
6e9ee1f137 Merge 'Documentation updates' #3110 2016-08-10 00:12:56 +00:00
MatthieuRivaud
d06fbc772f - Added dataset option |cubicInterpolationMode| to allow for curves with different interpolation modes on the same graph (updated doc accordingly) 
- Added new sample file to demonstrate the monotone cubic interpolation mode
- Fixed a typo in a comment in updateBezierControlPoints
 2016-08-08 15:35:46 +02:00
Zach Panzarino
660c3850d7 Documentation updates 
Adds a lot of new information to the docs that will help developers better utilize the entire Chart.js library

List of implemented changes:
 - Reverse option for legends (resolves #3102)
 - Information about chart resizing (resolves #3023)
 - Mixed chart types (resolves #2825) (resolves #2431)
 - Chart library comparison table (resolves #2605)
 - getDetasetMeta function information (resolves #2521)
 - Popular Extensions (resolves #2365)
 2016-08-08 03:08:13 +00:00
Michael Oberwasserlechner
27010c4619 Remove non existing property from radar samples #3026 2016-07-24 10:49:03 +02:00
Evert Timberg
b6686f00f4 Non numeric y (#2849) 
* Category scale can now read from the xLabels and yLabels properties.

* Update docs with section regarding the data object.

* Add sample file with non numeric Y and fix animations
 2016-07-09 09:22:25 -06:00
Evert Timberg
a1f94b1a57 update sample to have negative numbers 2016-07-09 10:01:15 -04:00
amlethojalen
988423b05e Fixed up formatting suggestions/issues as per comments from zachpanz88 2016-07-07 08:35:21 +10:00
amlethojalen
68728fc9a7 Added ability to render a line chart as a stepped line chart. 
Added option.elements.line.stepped
Added dataset.steppedLine
Added Sample, and updated documentation.
 2016-07-06 11:13:12 +10:00
Evert Timberg
9082507c1c Merge pull request #2555 from simonbrunel/travis-dist 
Travis GitHub Releases
 2016-06-28 08:39:57 -04:00
ronaldgrn
886803aa84 Fix line example not showing Scale Titles 
scaleLabel should have display: true instead of show: true
 2016-06-26 14:07:51 -03:00
Simon Brunel
53a0c5442e New Chart.js.zip package 
Samples need to be packaged with built libraries (which one have been removed from the repository), so create a new `gulp package` task to generate a ZIP archive with dist files, samples and the license file. This archive is generated in the ./dist/ folder and will be deployed by Travis along the GH release. Note that the ./dist/ folder is not preserved but merged in the archive root. Also change samples requiring moment.js to load this lib from the CDN instead of the ./node_module folder.
 2016-06-18 12:14:31 +02:00
Evert Timberg
b1c50ed0c2 Merge pull request #2732 from chartjs/scale-colors-per-line 
Scale colors per line
 2016-06-09 18:35:48 -04:00
Evert Timberg
6b2cfd5e11 Support arrays of colors and line widths in cartesian axes 2016-06-07 20:22:06 -04:00
Evert Timberg
a687749ed4 Radial linear scale array properties for line width and color 2016-06-07 20:09:33 -04:00
Evert Timberg
80bd7d3f60 Initial vertical legend mode 2016-06-06 21:41:40 -04:00
Tarqwyn
2bc8e3c7f6 This PR allows for multi-line labels, as per Slack discussion.. 
Usage: If a label is an `array` as opposed to a `string` i.e. `[["June","2015"], "July"]` then each element is treated as a seperate line. The appropriate calculations are made to determine the correct height and width, and rotation is still supported.

view samples/line-multiline-labels.html to see it working.

On branch multiline_labels
Changes to be committed:
	modified:   docs/03-Line-Chart.md
	new file:   samples/line-multiline-labels.html
	modified:   src/core/core.helpers.js
	modified:   src/core/core.scale.js
 2016-06-03 17:12:19 +01:00
Evert Timberg
11345b6c89 Polar area controller improvements 2016-05-30 21:42:15 -04:00
Evert Timberg
8d20379e29 Initial tooltip tests + fix a bug when the tooltip beforeLabel and afterLabel callbacks returned strings 2016-05-28 15:26:46 -04:00
Evert Timberg
1b277a71e4 Fix pie custom tooltip sample 2016-05-28 10:48:33 -04:00
Blake Niemyjski
3db9962c9b Fixed a syntax error in the sample 2016-05-16 18:14:14 -05:00
Blake Niemyjski
73fa358eb4 removed extra momentjs script tag 2016-05-13 21:04:40 -05:00
Tanner Linsley
2ee37e12e3 2.1.0 build 2016-05-03 16:53:09 -05:00
potatopeelings
c2cc3fbb4c Feature #73 - Horizontal Bar Chart (#2448) 
* Horizontal bar chart type

* Mentioned horizontal bar chart in bar documentation

* Sample file for horizontal bar chart

* Missing semicolon

* Fix for borderSkipped index
 2016-05-03 16:45:43 -05:00
Evert Timberg
99c2d67813 Merge pull request #2421 from mchateloin/pie-demo-randomize-colors 
Randomize data button randomizes colors in pie chart demo
 2016-04-29 18:18:38 -04:00
Miguel Chateloin
3067249376 Randomize data button randomizes colors in pie chart demo 2016-04-29 17:47:27 -04:00
Zach Panzarino
adc430fc66 Include correct script in pie custom tooltips sample 
Fixes issue #2369
 2016-04-29 17:08:59 +00:00
Evert Timberg
f68545c288 Update sample for new meta system 2016-04-28 07:18:05 -04:00
Evert Timberg
03fb66751f Make animation options consistent for polar area and doughnut charts (#2342) 
* Make animation options consistent and fix an issue when `animateRotate === false` in the polar area chart

* Update docs for moved options

* Fix typo
 2016-04-27 16:07:21 -05:00
Jannis Achstetter
1a26298d02 Add an example showcasing the different point size options 2016-04-21 16:03:47 +02:00
Jannis Achstetter
c3c664bfc6 Add the option to an example (there was no other example overwriting tension for a specific dataset) 2016-04-21 09:41:28 +02:00
Tanner Linsley
af1adf6b84 Merge branch 'master' into v2.0-dev 2016-04-16 18:13:23 -05:00
Evert Timberg
39cf4cc474 Merge pull request #2264 from thukaramvh/tvenkat_bleeding_edge 
Graph Index Data Labels display for Line Bar Graph for v2.0
 2016-04-16 08:44:19 -04:00
Thukaram V H
ac4a4bfd67 Data Labels display for Line Bar combo for v2.0 
Data Labels display for Line Bar combo for v2.0
 2016-04-14 21:57:58 -07:00
Aman Sharma
e251d06ef5 Using the dynamic absolute position of the canvas, even for relative placement of the chart 
This will work with both relative and absolute position for the chart and will apply the tooltips appropriately. I have tested in a normal context and then also using the chart in the second column of two column table i.e. in a different position on the screen. Without this, the default tooltips will appear at the same position no matter where the chart is placed. They will appear misplaced. The fix I have provided allows the tooltips to appear smoothly with the chart, no matter where it is placed on the web page.
 2016-04-15 00:11:09 -04:00
Aman Sharma
69716a45d3 Updating to use the absolute position even if the chart canvas element is having relative position 
This will work with both relative and absolute position for the chart
 2016-04-13 14:34:26 -04:00
Ivan Samoylenko
81e1448836 Added 'borderSkipped' parameter to Rectangle. 2016-03-13 18:58:36 +03:00
Ville Hämäläinen
33a1fa928d fix consistency with other samples 2016-02-28 10:20:10 +02:00
Ville Hämäläinen
04fe614800 fix title 2016-02-28 10:16:09 +02:00
Ville Hämäläinen
2977c8eb9c improve doughnut sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
- remove logs
 2016-02-28 10:15:18 +02:00
Ville Hämäläinen
a4fa956ab4 improve scatter sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
 2016-02-28 10:10:45 +02:00
Ville Hämäläinen
13fc892114 improve scatter-multi-axis sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
 2016-02-28 10:09:14 +02:00
Ville Hämäläinen
94cd6a480c improve polar-area sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
 2016-02-28 10:05:31 +02:00
Ville Hämäläinen
595464fc7e improve polar-area sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
 2016-02-28 10:03:43 +02:00
Ville Hämäläinen
5602826aeb improve combo-bar-line sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
 2016-02-28 10:01:34 +02:00
Ville Hämäläinen
0985e6d564 improve bar sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
- fix x-axis labels when adding data
 2016-02-28 10:00:01 +02:00
Ville Hämäläinen
680fa8a68e improve bar-stacked sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
 2016-02-28 09:55:28 +02:00
Ville Hämäläinen
e7233c2f61 improve bar-multi-axis sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
 2016-02-28 09:54:16 +02:00
Ville Hämäläinen
72f59264e9 fix titles 2016-02-28 09:50:45 +02:00
Ville Hämäläinen
2513d5dd48 improve time-scale sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
- remove logs
 2016-02-28 09:50:31 +02:00
Ville Hämäläinen
14fd5de460 improve combo-time-scale sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
- remove logs
 2016-02-28 09:46:59 +02:00
Ville Hämäläinen
0480f2e18d improve progress-bar sample 
- set title
- set same size canvas as other samples
- fix adding data after all data has been removed
- remove user select from canvas
- remove html legend
 2016-02-28 09:43:21 +02:00
Ville Hämäläinen
f23b640c81 improve progress-bar sample 
- set title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
 2016-02-28 09:29:29 +02:00
Ville Hämäläinen
9d210d8a8c improve tooltip-hooks sample 
- set title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
- remove html legend
 2016-02-28 09:25:46 +02:00
Ville Hämäläinen
c7845d124d improve radar-skip-points sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
 2016-02-28 09:22:14 +02:00
Ville Hämäläinen
428567d8cf improve radar sample 
- improve title
- set same size canvas as other samples
- remove user select from canvas
- remove html legend
 2016-02-28 09:18:56 +02:00
Ville Hämäläinen
aa604af05b improve line-x-axis-filter sample 
- set title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
- remove logs
 2016-02-28 09:02:59 +02:00
Ville Hämäläinen
194c11c3d7 improve line-stacked-area sample 
- set title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
- remove logs
- remove html legend
 2016-02-28 08:59:38 +02:00
Ville Hämäläinen
cd52936473 improve line-skip-points sample 
- set title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
- remove logs
- remove html legend
 2016-02-28 08:56:26 +02:00
Ville Hämäläinen
48cb104f14 improve line-logarithmic sample 
- set title
- set same size canvas as other samples
- remove user select from canvas
- remove logs
 2016-02-28 08:24:58 +02:00
Ville Hämäläinen
a7b16464bf improve line-logarithmic sample 
- set title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
- remove logs
 2016-02-28 07:57:02 +02:00
Ville Hämäläinen
1f8709f88a fix x-axis labels when adding data 2016-02-28 07:51:40 +02:00
Ville Hämäläinen
87633f61e9 improve line-legend sample 
- improve title
- set same size canvas as other samples
- fix x-axis labels when adding data
- remove user select from canvas
- remove logs
 2016-02-28 07:50:13 +02:00
Ville Hämäläinen
dae599e16d improve line-customTooltips sample 
- set title for chart
- set same size canvas as other samples
- remove user select from canvas
- remove logs
 2016-02-28 07:34:37 +02:00
Ville Hämäläinen
4729b05cc1 improve line chart sample 
- set title for chart
- remove html legend
- set same size canvas as other samples
- remove user select from canvas
 2016-02-28 07:28:39 +02:00
Ville Hämäläinen
521236bd92 improve bubble chart sample 
- fix add dataset when all datasets have been removed
- set title for chart
- remove html legend
- set same size canvas as other samples
- remove user select from canvas
- set name for added datasets
 2016-02-28 07:13:09 +02:00
etimberg
f6951816a0 Improve joshing reporting. Added a JSHint config file. 
Fixed JSHint warnings.
 2016-02-13 20:12:26 -05:00
Tanner Linsley
c5020c3e5a Updated Samples 2016-02-11 23:45:25 -07:00
Tanner Linsley
007d029837 Bundled builds 
Possible usages are:

src/Chart.js (umd)
dist/Chart.js (ChartJS)
dist/Chart.min.js (ChartJS minified)
dist/Chart.bundle.js (ChartJS with Moment.js)
dist/Chart.bundle.min.js (ChartJS with Moment.js minified)
 2016-02-11 21:29:26 -07:00
etimberg
84ed07a84e Update bar sample file to use elements config. Fixes #1292 2016-02-07 20:06:50 -05:00
Evert Timberg
6aa2933ec5 Bubble controller tests 2016-01-24 10:59:19 -05:00
Evert Timberg
76ef7de646 Fix sample file addData button 2016-01-21 21:32:59 -05:00
Evert Timberg
c8ea3af32c All sample files use CDN version of jQuery to make getting started easier. 2016-01-21 20:50:48 -05:00
Evert Timberg
2caff1f4fa Fix sample showing scale titles 2016-01-01 12:21:16 -05:00
Evert Timberg
716e303230 Call animation callbacks. Created a sample file that shows their use by updating a progress bar during the animation. Updated the documentation to show how they are called. 2015-12-12 10:01:08 -05:00
Evert Timberg
819f865723 Merge branch 'v2.0-dev' into v2.0-legend 
Conflicts:
	src/controllers/controller.doughnut.js
 2015-12-07 22:10:38 -05:00
Evert Timberg
bffbaf6b37 Generate label strings using an option function. This allows new chart types to override 2015-12-06 12:53:45 -05:00
Evert Timberg
792ee587ae Split legend and title block functionality into 2 separate blocks. This allows the title to be on the top of the chart while the legend is on the bottom 2015-12-06 10:20:38 -05:00
Evert Timberg
28fc6841f3 Add tooltipFormat option to time scale options. 
Fix bars when displayed on a time scale.
Updated sample files.
 2015-12-05 19:33:33 -05:00
Evert Timberg
5df23df291 Move time sample files to sub folder 2015-12-05 10:54:45 -05:00
Evert Timberg
744e1429b9 Label polar area and doughnut datasets 2015-12-04 20:32:18 -05:00
Evert Timberg
59fb1696a8 Highlight correct items when hover mode is set to 'dataset' 2015-12-04 20:01:04 -05:00
Evert Timberg
d8704ee37d Add legends to sample files 2015-12-03 22:03:39 -05:00
Evert Timberg
dcc06eb3bb Merge branch 'v2.0-dev' into v2.0-legend 
Conflicts:
	src/core/core.scaleService.js
 2015-12-03 21:21:10 -05:00
Evert Timberg
b2150b93a2 New built files + some sample file updates 2015-11-29 13:33:24 -05:00
wcatron
a0377362d7 Update remainder of tables for radar, polar, and pie. 2015-11-23 19:32:38 -05:00
Evert Timberg
2a9b3e5221 Merge branch 'v2.0-dev' into v2.0-legend 
Conflicts:
	src/core/core.controller.js
 2015-11-21 09:23:33 -05:00
Tanner Linsley
fe77f07c07 Merge pull request #1642 from nnnick/fix/1527 
Doughnut, polar area, and radar samples should use the same canvas style
 2015-11-16 16:10:24 -07:00
Tanner Linsley
ae9db841f9 Merge pull request #1646 from nnnick/fix/1640 
Can now replace entire chart data object on the fly
 2015-11-16 16:10:01 -07:00
Evert Timberg
3a193e2117 Update samples 2015-11-15 11:17:02 -05:00
Evert Timberg
6d708a8f2c Update line sample to change the entire data object 2015-11-13 10:01:38 -05:00
etimberg
471a5f5aaa Doughnut, polar area, and radar samples should use the same canvas style 2015-11-11 19:06:36 -05:00
Derek Perkins
29c3bd3746 Merge pull request #1603 from nnnick/fix-tooltips 
Only call custom tooltips when elements have changed.  But be sure to call update internally any time that tooltips need to be redrawn.
 2015-11-01 22:52:46 -07:00
Tanner Linsley
f4a5a30451 Only call custom tooltips when elements have changed. But be sure to call update internally any time that tooltips need to be redrawn. 2015-11-01 13:56:36 -07:00
Derek Perkins
b823bae63e Merge pull request #1600 from nnnick/fix-line-stacked-area 
Fix line stacked area
 2015-10-31 22:48:29 -06:00
Tanner Linsley
e4d308f329 Stacked Area Example 2015-10-31 22:45:11 -06:00
Evert Timberg
cf587122da Merge pull request #1586 from nnnick/fix/begin-at-zero-issue-with-constant-data 
Scale expansion if min === max will only occur after ticks.beginAtZero is handled
 2015-10-31 20:23:57 -04:00
Tanner Linsley
69bff1183f Better Example 2015-10-31 18:17:52 -06:00
Tanner Linsley
0494d551b6 Custom Tooltip example now works with the basics 2015-10-31 16:08:55 -06:00