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
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
etimberg
3aaa3e27f3 suggestedMin and suggestedMax options for scales 2015-10-31 11:01:40 -04:00
Tanner Linsley
a1fb98c79f Line Sample Updated 2015-10-27 02:34:31 -06:00
Tanner Linsley
a91dba3e8a 50% Canvas Legend Support 2015-10-26 13:57:59 -06:00
etimberg
bfabac945f Labels are now optional for the time scale. 2015-10-19 19:20:08 -04:00
etimberg
2b057cf690 Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor 2015-10-18 18:17:39 -04:00
etimberg
7603b3cc36 Time scales now support passing in data as points. Added this to the time scale sample file. 2015-10-18 18:00:46 -04:00
Tanner Linsley
19a7c57e2f All tooltip callbacks support arrays for lines, and no drawing invisible tooltips. 
Simply return a string for a single line tooltip, or return an array to
create multiple lines.
 2015-10-17 15:53:33 -06:00
Evert Timberg
9526c77675 Merge pull request #1512 from nnnick/v2.0-dev-bubble-controller 
Bubble Chart Type and Bubble Controller
 2015-10-17 08:46:44 -04:00
Tanner Linsley
b835d5f209 Tooltip Hooks 2015-10-12 14:51:00 -06:00
Evert Timberg
0d2fa807da Update samples with some hidden datasets 2015-10-07 19:54:53 -04:00
Tanner Linsley
ef5cec7f5e Tooltips now using new lineArray format 2015-10-06 20:40:25 -06:00
Tanner Linsley
65f9ee8a4a Bubble Chart Type and Bubble Controller 2015-10-05 12:40:28 -06:00
Tanner Linsley
4c79c5756f Time Scale Samples updated to import moment beforehand 2015-09-28 12:46:25 -06:00
Evert Timberg
77faacb467 Removed the line scale override file since functionality no longer directly exists. Updated the core scale drawing with tighter padding & better drawing when on top. Updated tests 2015-09-27 21:34:16 -04:00
Evert Timberg
49a8b191c4 Update logX sample to use correct label callback 2015-09-26 16:50:59 -04:00
Tanner Linsley
b22f569e4d Merge branch 'v2.0-dev' into v2.0-dev-refactor 
Conflicts:
	samples/line-scale-override.html
	samples/line-x-axis-filter.html
	samples/line.html
	src/controllers/controller.bar.js
	src/core/core.controller.js
	src/scales/scale.category.js
 2015-09-24 14:34:26 -06:00
Tanner Linsley
8cda74e691 Pie.customtooltips is outdated. Removing for now. 2015-09-24 13:05:46 -06:00
Tanner Linsley
dc3f58f044 Doughnut.color is outdated. Removing for now. 2015-09-24 13:01:07 -06:00
Tanner Linsley
d198157fb8 Time Scale working, troubleshooting log scale 2015-09-24 12:07:40 -06:00
Tanner Linsley
ca48caa8b0 checkpoint for the morning check 
made some good progress.  Just need some more eyes on it, cuz I’m
literally typing without my glasses on right now.
 2015-09-24 02:25:21 -06:00
Tanner Linsley
c7107677d2 Stuck on shared vertical scale draw logic 
Trying to make all scales share the same draw function for both
horizontal and vertical.  For some reason the vertical linear scale on
line.html has a width that is too small
 2015-09-23 21:52:31 -06:00
Tanner Linsley
9b9ebca246 Checkpoint 1, Pew!!!! 2015-09-22 19:31:26 -06:00
Evert Timberg
029aad4f35 Update samples to no longer use old functions and instead modify the data directly 2015-09-21 21:00:58 -04:00
Tanner Linsley
301efac8dd Merge pull request #1477 from etimberg/feature/scale-labels 
Scale Labels
 2015-09-21 17:52:09 -06:00
Tanner Linsley
01fdd387d9 Merge pull request #1474 from nnnick/v2.0-feature-dynamic-bar-spacing 
Bar spacing is now dynamic at small sizes.
 2015-09-21 13:08:09 -06:00
Tanner Linsley
154083b875 Bar spacing is now dynamic at small sizes. 
Closes #1468
 2015-09-21 12:57:04 -06:00
Tanner Linsley
2a76ff0037 Time scale now draws all ticks, instead of half of them 
Closes #1463
 2015-09-21 11:52:17 -06:00
Evert Timberg
6ba0fc3e08 Update sample files 2015-09-20 19:25:17 -04:00
Evert Timberg
39252d4633 Use hidden iframe to detect resize + obey max width when getting maximum size. Updated the bar sample to start off hidden. Use the 'show' button to display the graph 2015-09-20 10:30:12 -04:00
Evert Timberg
9474d72491 Revert "Fix resize problems when charts are initially hidden" 2015-09-19 17:52:58 -04:00
Tanner Linsley
862045e49a Merge pull request #1465 from nnnick/v2.0-dev-time-scale-bars-and-combo 
Bar and combo support for time scale
 2015-09-18 18:59:58 -06:00
Evert Timberg
bcbd9a85e6 Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems 
Conflicts:
	gulpfile.js
 2015-09-18 18:38:47 -04:00
Tanner Linsley
677c249b61 Bar and combo support for time scale 2015-09-18 11:31:25 -06:00
Tanner Linsley
92682abbae Merge pull request #1459 from nnnick/v2.0-dev-feature-time-axis 
V2.0 dev feature time axis
 2015-09-17 15:54:44 -06:00
Tanner Linsley
2598446d54 Time Scale Rewrite 2015-09-15 11:40:01 -06:00
Evert Timberg
c1f0a39982 Fixes to show all lines but not all labels. Added a variable in the template function to make debugging nicer. 2015-09-14 20:32:23 -04:00
Evert Timberg
e0cdfc6d2d Update logarithmic sample. Created a new logarithmic sample using AC circuit simulation data of an RLC filter. 2015-09-14 19:46:28 -04:00
Evert Timberg
77f90a85ef Merge remote-tracking branch 'upstream/v2.0-dev' into feature/logarithmic_scale 2015-09-14 18:59:52 -04:00
Evert Timberg
e6220f474b Attempting to make resize better 2015-09-14 18:50:52 -04:00
Tanner Linsley
fe5ef1584b Add Line chart with time scale sample 2015-09-10 22:48:20 -06:00
Jan Kalina
ef539bf4a7 Reverse scale on radar/polar area 2015-09-02 23:21:39 +02:00
Evert Timberg
04d1f0f710 Category scale filter function will hide the grid line if null or undefined returned. 2015-08-23 13:20:43 -04:00
Evert Timberg
eb833723cd initial logarithmic scale 2015-08-08 18:34:19 -04:00
Evert Timberg
925e305184 Doughnut legends (only makes sense for first dataset). 2015-07-05 14:56:22 -04:00
Evert Timberg
84aba3f6d3 Polar area legends 2015-07-05 14:48:04 -04:00
Evert Timberg
0caa2a79ae Legends for Line, Bar & Radar charts. 2015-07-05 14:47:56 -04:00
Evert Timberg
6110352df8 Add userCallback to category scale + demo file 2015-06-22 19:03:01 -04:00
Tanner Linsley
bc8526efe7 Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev 2015-06-22 13:10:52 -06:00
Tanner Linsley
25fd84490b Support for custom tooltips again 2015-06-22 13:10:49 -06:00
Evert Timberg
82de2f1351 Can now change more properties for line drawing. Updated the sample file to demo 2015-06-20 09:47:35 -04:00
Evert Timberg
46af76a8ed addData is now supported by the doughnut chart + updated the sample to match. 2015-06-19 19:51:28 -04:00
Evert Timberg
2dd49f0c92 Fix a missing this in the scale generateTicks method when manually overriding. Added a sample to test this. 2015-06-19 19:13:31 -04:00
Tanner Linsley
8cecd5935e Tooltip Title width now accurately measured 2015-06-19 12:36:22 -06:00
Evert Timberg
7796c4e87d Add and remove data for bar charts 2015-06-17 22:03:24 -04:00
Evert Timberg
271d37f572 Update radar sample + use the same colour functions in all samples 2015-06-16 22:21:40 -04:00
Evert Timberg
c9c1853c57 Update pie sample file to support add and remove datasets 2015-06-16 22:16:28 -04:00
Evert Timberg
fd7a4e9bd7 Update doughnut sample to support adding and removing datasets 2015-06-16 22:12:59 -04:00
Evert Timberg
f2298aed77 Update bar sample to handle adding and removing datasets 2015-06-16 22:05:20 -04:00
Evert Timberg
e7850a796e Update line sample to test adding and removing datasets 2015-06-16 22:05:06 -04:00
Evert Timberg
056b9550d0 Create interfaces similar to the old interfaces. Ensure that scales always have IDs before controllers are built. 2015-06-16 19:20:26 -04:00
Tanner Linsley
e3ffbb155f Deprecate animationLoop function 2015-06-16 11:57:35 -06:00
Tanner Linsley
34f8bc99c6 Better demo for combo 2015-06-16 11:37:14 -06:00
Tanner Linsley
db981807bb Polar Area Draws, but has scale resizing issues 2015-06-16 00:39:04 -06:00
Tanner Linsley
1f302f09bb Fixed polar-area sample 2015-06-16 00:20:46 -06:00
Tanner Linsley
2d5eb6d57e Radar chart and radialLinear scale 2015-06-16 00:17:26 -06:00
Tanner Linsley
5759f419c0 Pie used new doughnut controller 2015-06-15 22:47:20 -06:00
Tanner Linsley
36de623401 Merge remote-tracking branch 'origin/feature/controllers' into feature/controllers 2015-06-15 19:14:26 -06:00
Tanner Linsley
74f161b548 Core improvements, arc & doughnut partially working 2015-06-15 19:14:11 -06:00
Evert Timberg
22c40fe752 Fix 2 bar samples 2015-06-15 19:34:29 -04:00
Tanner Linsley
9f9237905a Line now draws 2015-06-15 16:19:56 -06:00
Tanner Linsley
257bdb2dbb Hybrid Line and Bar chart - Line Now drawing 2015-06-15 15:27:56 -06:00
Tanner Linsley
aaa2484e1b Controller function organization 2015-06-14 19:42:39 -06:00
Tanner Linsley
d73dae09e7 No hardcoded chart type methods 2015-06-14 19:15:10 -06:00
Evert Timberg
109de75c6a Create linear scale default settings. Cleaned up unnecessary settings from bar, line, and scatter default configs. Removed unnecessary config options from the affected sample files 2015-06-13 13:57:55 -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
Evert Timberg
c5e4912319 Rename 'scaleType' property to 'type; throughout samples & code 2015-06-12 18:24:51 -04:00
Tanner Linsley
cfc008686b File structure fixes and gulp watch working again 2015-06-12 16:15:33 -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
Evert Timberg
2a62e0e04d Reset elements for bar charts. Bar multi axis demo also shows different colours for each bar. 2015-06-03 18:35:42 -04:00
Tanner Linsley
8b0b6194b2 No playground 2015-06-03 15:25:28 -06:00
Tanner Linsley
235247eb12 example fixes 2015-06-03 15:18:42 -06:00
Tanner Linsley
b3b5896329 Polar Area 2015-06-03 14:45:40 -06:00
Tanner Linsley
9be48a73ea Pie Chart 2015-06-03 14:14:23 -06:00
Tanner Linsley
7e791e02f2 Radar Chart skipNull & bezier fixes 2015-06-03 12:05:04 -06:00
Tanner Linsley
6b0e609935 Bar Chart Stacked nestedConfig 2015-06-02 16:48:39 -06:00
Tanner Linsley
df4d2d2594 Stroked tooltip colors 2015-06-02 15:14:06 -06:00
Tanner Linsley
b7dc2339f4 line: skipNull functionality 2015-06-02 13:42:09 -06:00
Evert Timberg
edbb235668 Tooltip titles now work in the line chart. Getting ever closer to being done 2015-05-31 20:16:04 -04:00
Evert Timberg
92776ce0ac Animations & tool tips show. The title is not correct yet. 2015-05-31 16:55:17 -04:00
Evert Timberg
e48c7f168b Add back line fill option. This is set on a per dataset basis, but there is an override in the config. Demo this in the line sample. 2015-05-31 10:24:53 -04:00
Tanner Linsley
6af94298ec Radar Chart 2015-05-27 10:28:00 -06:00
Tanner Linsley
3a32144d89 Polar Area deep data 2015-05-26 22:02:41 -06:00
Evert Timberg
1352dfeb0f Fix the y scales that were missed in the previous check in 2015-05-23 21:49:01 -04:00
Evert Timberg
d4e7765a50 Clean up some unused config options. Renamed 'show' to 'display' for scales since that was clearer and maintains backwards compatibility. 2015-05-23 21:44:50 -04:00
Evert Timberg
b67afcd727 Bar chart converted to new scale system. Added bar chart multi axis sample. 2015-05-23 18:26:34 -04:00
Evert Timberg
181e866175 Fix line chart multi axis sample title 2015-05-23 17:50:27 -04:00
Evert Timberg
d998c803d3 Move line chart over to use new scale config. This adds support for multiple y axes. Added an example demonstrating this. 2015-05-23 15:19:30 -04:00