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
1,895 Commits 8 Branches 114 Tags 67 MiB
d381117236
Commit Graph

219 Commits

Author SHA1 Message Date
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
Evert Timberg
12e2ace039 Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0dev-xy 
Conflicts:
	src/Chart.Core.js

Fixed the sample files & chart type initialize methods so that this.data does not get set to undefined.
 2015-05-20 09:03:22 -04:00
Tanner Linsley
951e714e77 Playground and big changes 2015-05-20 00:03:45 -07:00
Evert Timberg
008bb1aab3 Set new tooltip templates for the scatter chart 2015-05-19 20:33:39 -04:00
etimberg
4b8c9bc30d Fix a drawing bug when drawTicks is false. 2015-05-18 20:59:21 -04:00
etimberg
978ed1bc1e Created a multi axis sample file. Added an option to draw ticks for the axes. This is useful when in a multi axis scenario so that the axis that does not draw grid lines does not have weird lines. 2015-05-18 20:39:59 -04:00
etimberg
676765e808 Initial config merge. Handles special cases for objects and arrays and merges smarter than simply replacing the default object. Tested by overriding the vertical axis 0 point colour. Also implemented dataset axis binding. If nothing is specified, the dataset is bound to the first x and y axis. 2015-05-18 14:19:34 -04:00
Evert Timberg
e30a9d2a94 The scatter example page now has negative numbers in both directions 2015-05-18 08:44:06 -04:00
Evert Timberg
d7ad5b6340 Add a scatter chart sample 2015-05-17 13:19:37 -04:00
Tanner Linsley
ad972a0c5c Pie cleanup. 2015-05-15 22:45:17 -06:00
Tanner Linsley
872c92cd4b Doughnut/Pie Chart refactor 2015-05-15 22:34:08 -06:00
Tanner Linsley
1d8d19d404 Prettified, and half way through doughut 2015-05-15 20:54:01 -06:00
Tanner Linsley
e58421a08a Line Chart label hoverMode & tooltips 2015-05-15 17:03:51 -06:00
Tanner Linsley
fb580a6e48 lineChart single hoverMode tooltips, fallbackColor global 2015-05-15 16:40:01 -06:00
Tanner Linsley
b432a3d6db labelMode tooltips and hover events 2015-05-14 23:18:47 -06:00
Tanner Linsley
4ef57315da Getting into 'label' hoverMode tooltips 2015-05-12 17:22:47 -06:00
Tanner Linsley
9f98334d6f Mid-code commit 2015-05-12 15:42:20 -06:00
Tanner Linsley
15f724f146 Rough Tooltips for 'single' hoverMode 2015-05-12 12:55:48 -06:00
etimberg
460399f651 Merge branch 'fix/bar_chart_negative_values' of https://github.com/etimberg/Chart.js into etimberg-fix/bar_chart_negative_values 
# Conflicts:
#	samples/bar.html
#	src/Chart.Bar.js
#	src/Chart.Core.js
 2015-05-12 08:00:14 -04:00
Tanner Linsley
9e4d90e110 Color Animation, Color Autopilot 2015-05-12 01:13:16 -06:00
Tanner Linsley
b8691c9581 Revert "Merge pull request #856 from tannerlinsley/editable-chart-config" 
This reverts commit a8063de6b8, reversing
changes made to 7f513b87ee.
 2015-05-11 18:57:14 -06:00
Tanner Linsley
cf07df07d6 Bar Attempt # 4 2015-05-08 16:20:21 -06:00
William Entriken
a8063de6b8 Merge pull request #856 from tannerlinsley/editable-chart-config 
Data now editable right from chart config
 2015-05-04 15:28:03 -04:00
Evert Timberg
972bc5636d Merge pull request #711 from cmweiss/master 
Default color for Doughnut/Pie
 2015-04-09 11:25:45 -04:00
Evert Timberg
ae7552a916 Draw bar chart negative values down from the 0 point of the scale. If all values are negative, draw down from the top. Updated the sample file to allow for negative bars. 2015-03-15 16:04:55 -04:00
Tanner Linsley
026611110a Updated Samples 
Samples now include a “Randomize Data” button which utilizes the latest
changes.
 2015-01-08 10:13:14 -07:00
Tanner Linsley
64de3eb711 externalTooltips now labeled customTooltips 2015-01-06 22:53:30 -07:00
Tanner Linsley
8c1e9588a1 External Tooltips, Documentation, and Samples 2014-12-30 13:05:11 -07:00
Christopher Weiss
7e21cb4e04 Pointed to core and doughnut. 2014-10-21 10:19:58 -04:00
Christopher Weiss
8984e8c2c4 Create doughnut.color.html 
To test the new version of doughnut.
 2014-10-21 10:16:30 -04:00
Nick Downie
94f22b656e Add in new chart samples 2014-06-29 18:36:04 +01:00
Nick Downie
a04082dba1 Remove site from repo 2014-06-29 17:38:59 +01:00
Nick Downie
d30edc1b8d Cleared up folder structure 2013-03-25 19:25:57 +00:00