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

2878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tanner Linsley
0486db1e74 Category Scale display false fixes 2015-06-13 00:30:42 -06:00
Evert Timberg
6185f156ea Make the line and scatter charts almost identical. Next step is to merge them 2015-06-12 22:35:48 -04:00
Evert Timberg
d37e65c58c Convert line chart to tabs from spaces 2015-06-12 22:07:07 -04:00
Evert Timberg
43efda72d4 Merge pull request #1202 from etimberg/feature/v2.0-scale-refactor 
Push some of the scatter scale information down to the linear scale.
 2015-06-12 21:54:03 -04:00
Evert Timberg
e55c0d4945 Push some of the scatter scale information down to the linear scale. 2015-06-12 21:46:47 -04:00
Evert Timberg
a518833f96 Merge pull request #1201 from etimberg/feature/v2.0-scale-refactor 
Move stacked options into scales. Can be configured independently for each axis
 2015-06-12 21:22:06 -04:00
Evert Timberg
49fe78643a Removed unused options from the bar and line charts 2015-06-12 21:16:23 -04:00
Evert Timberg
d2ef4c9831 Move more data into the linear scale.This simplifies buildScale for line and bar charts 2015-06-12 21:15:15 -04:00
Evert Timberg
ec7b87d69c Move some functions into the category scale. This cleans up the bar chart interface & allows for waterfall charts by settings stacked to false on the category axis but stacked to true on the y axis 2015-06-12 20:50:26 -04:00
Evert Timberg
1e01e29f88 Bar stacked sample 2015-06-12 19:10:11 -04:00
Tanner Linsley
e9f206606d Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev 2015-06-12 16:39:43 -06:00
Evert Timberg
c5e4912319 Rename 'scaleType' property to 'type; throughout samples & code 2015-06-12 18:24:51 -04:00
Tanner Linsley
63b7b18b17 Category Scale fixed 2015-06-12 16:18:20 -06:00
Tanner Linsley
cfc008686b File structure fixes and gulp watch working again 2015-06-12 16:15:33 -06:00
Tanner Linsley
e1237feb97 File structure for extensibility 2015-06-12 16:08:27 -06:00
Tanner Linsley
cf88ec8333 File structure fixes, Radar Chart tooltip fixes 2015-06-12 15:37:38 -06:00
Tanner Linsley
bba2dda59a No Logging 2015-06-12 15:28:50 -06:00
Tanner Linsley
e2601f71e3 Hidden Scales Fixes 2015-06-12 15:28:30 -06:00
Tanner Linsley
195c794e5d File structure fixes 2015-06-12 14:48:20 -06:00
Tanner Linsley
5732e0d72a More maintainable file structure 2015-06-12 14:00:48 -06:00
Tanner Linsley
187163763e Line element custom override support 2015-06-11 10:04:08 -06:00
Tanner Linsley
15a32f4c78 Gulp build 2015-06-11 09:48:17 -06:00
Tanner Linsley
a76640c409 Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev 2015-06-11 01:06:07 -06:00
Tanner Linsley
11773a5825 Hover states, Scale padding, and mouse out fixes 2015-06-11 01:05:44 -06:00
Evert Timberg
65de784be1 Merge pull request #1193 from etimberg/fix/scale-small-number-display 
By default use toLocaleString() when generating labels for the axes. …
 2015-06-10 20:14:26 -04:00
Evert Timberg
55cf07926c By default use toLocaleString() when generating labels for the axes. This prevents misformatted numbers due to doubles. It also makes large numbers nicer with commas by default. 2015-06-10 20:08:12 -04:00
Kevin Kirsche
3d389d7c09 Remove moot version property from bower.json 
Per bower/bower.json-spec@a325da3
 2015-06-10 18:25:22 -04:00
Maxime Veber
28d30b4f5b Added ignore section 2015-06-10 22:32:23 +02:00
Evert Timberg
bd39534c2f Merge pull request #1187 from etimberg/fix/config-merge-clone 
Fix an error when merging null config values
 2015-06-09 20:36:44 -04:00
Evert Timberg
9dc63f0349 Merge pull request #1186 from etimberg/fix/log10 
Use a polyfill when Math.log10 does not exist
 2015-06-09 20:36:23 -04:00
Evert Timberg
edd93f27ce Merge pull request #1180 from etimberg/fix/scale-zero-point 
Use the correct base for linear scales
 2015-06-09 20:36:15 -04:00
Evert Timberg
97a2232fbf Forgot that typeof null === 'object' 
Added a check for this condition so that merge works correctly
 2015-06-09 18:43:33 -04:00
Evert Timberg
29743e1d63 Use a polyfill when Math.log10 does not exist 2015-06-09 18:24:43 -04:00
paulmasson
d1cccd3546 Update CDN link 2015-06-08 16:45:47 -07:00
Evert Timberg
2bddccaaf0 Use the correct base for linear scales. This gives the correct fill for lines and animations start at the correct point 2015-06-08 19:03:47 -04:00
Tanner Linsley
8f5d702a86 chart.update(animationDuration) support 2015-06-08 15:57:47 -06:00
Tanner Linsley
24d32e9321 Gulp build 2015-06-08 13:14:05 -06:00
Tanner Linsley
679fa4e72e Clone in configMerge 2015-06-08 13:12:20 -06:00
Evert Timberg
9b4ebc3a05 Merge branch 'etimberg-fix/polar-area-angle-fix' into v2.0-dev 2015-06-07 09:48:31 -04:00
Evert Timberg
7d4ead51f7 Merge branch 'fix/polar-area-angle-fix' of https://github.com/etimberg/Chart.js into etimberg-fix/polar-area-angle-fix 
Conflicts:
	src/Chart.Core.js
 2015-06-07 09:48:05 -04:00
Evert Timberg
bcd834c084 Merge pull request #1169 from etimberg/fix/skip-data-type 
Only skip when the data is null, not when it is not a number
 2015-06-07 09:38:17 -04:00
Tanner Linsley
593a1eacc8 Merge pull request #1172 from etimberg/fix/scale-fit-updates 
Scale fit updates
 2015-06-06 13:13:24 -06:00
Evert Timberg
d05d29aa66 Make the angle calculations more robust. Also ensure that angles in polar area charts are calculated similarly to angles in doughnut / pie charts 2015-06-06 11:06:40 -04:00
Evert Timberg
4a3a9f1a21 Change the scale fitting code from 2 pass fit to a 2.5 pass fit. The fit function is now passed a margin object that contains the margins on the left, top, right, and bottom of the scale. This is useful to know if you can draw outside of the width. This is used by the dataset scale so that extra padding is only added for long labels if absolutely required. If there is unused space underneath the vertical axes, that space is used first. 2015-06-06 09:27:03 -04:00
Evert Timberg
a89ede0d72 Bring linear axis labels closer to the tick marks when in a horizontal configuration. Reduced excess whitespace. 2015-06-06 08:21:16 -04:00
Evert Timberg
65ec618a48 Some improvements to the linear scale. Made the tick marks smaller (5px vs 10px) and tightened up the drawing. Removed the use of maxWidth in ctx.fillText since that is not supported in Safari 2015-06-06 08:12:13 -04:00
Evert Timberg
e63d5a3367 Only skip when the data is null, not when it is not a number 2015-06-05 18:03:35 -04:00
Tanner Linsley
5b5463b6f9 Merge pull request #1164 from etimberg/fix/angle-calculation 
Fix the angle calculation for slice detection
 2015-06-04 16:39:59 -06:00
Tanner Linsley
205163641f Doughnut/Pie Fixes 2015-06-04 16:39:05 -06:00
Evert Timberg
09eae7ff28 Fix angle calculation in determining which arcs are underneath the event point 2015-06-04 18:31:44 -04:00