Evert Timberg
635ec58616
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig
2015-06-02 20:07:07 -04:00
Evert Timberg
f44dd06826
Better animations when chart is first initialized.
2015-06-02 20:06:50 -04:00
Tanner Linsley
02d7442e4f
!bar borderWidth
2015-06-02 17:29:17 -06:00
Evert Timberg
80a25af502
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig
2015-06-02 18:55:41 -04:00
Evert Timberg
9b2d2efc7a
Animation on refresh
2015-06-02 18:54:18 -04:00
Tanner Linsley
6b0e609935
Bar Chart Stacked nestedConfig
2015-06-02 16:48:39 -06:00
Tanner Linsley
74d3890ba9
no legend yet... :(
2015-06-02 15:14:51 -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
Evert Timberg
8a550852da
Check in work from floobits with minor changes to fix some errors
2015-05-31 09:47:10 -04:00
Tanner Linsley
6af94298ec
Radar Chart
2015-05-27 10:28:00 -06:00
Tanner Linsley
1163efbcca
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
...
Conflicts:
src/Chart.PolarArea.js
2015-05-26 22:06:20 -06:00
Tanner Linsley
3a32144d89
Polar Area deep data
2015-05-26 22:02:41 -06:00
Evert Timberg
e3519f5bd4
More nested config stuff. Not sure what all of the options in the line config do, but left them in. Ensured that tooltips work.
2015-05-26 21:16:18 -04:00
Evert Timberg
e774a893da
Use new animation options in the animation service.
2015-05-26 18:54:36 -04:00
Tanner Linsley
b03a057a76
Nested globals
2015-05-26 16:52:16 -06:00
Evert Timberg
a2d477ac5e
Moved radial scale into Chat.Scale.js. Registered as "radialLinear" which will allow radialLogarithmic, etc in the future. Updated the polar area and radar charts to use the new scale config. The scales draw, but the points do not. This is no different than the current v2.0 branch
2015-05-24 14:33:12 -04:00
Evert Timberg
73b579c962
Remove old linear scale
2015-05-23 21:21:40 -04:00
Evert Timberg
a559ab85cd
Ensure consistency in the helpers.toRadians name
2015-05-23 15:18:33 -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
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
2e383da0d8
Handle the beginAtZero option for a linear scale. Added a helper for Math.sign
2015-05-18 08:51:13 -04:00
Evert Timberg
b5b0081108
Some helper functions needed for better scales.
2015-05-16 19:38:31 -04:00
Tanner Linsley
fff81c455d
Tooltip Position, Active Element Position, Tooltip animation follow
2015-05-15 23:07:21 -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
09c11440dd
inGroupRange function for bar charts label mode
2015-05-15 17:07:41 -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
f79ebdaa88
Stable Bar Chart, DRY core functions
2015-05-15 00:04:42 -06:00
Tanner Linsley
b432a3d6db
labelMode tooltips and hover events
2015-05-14 23:18:47 -06:00
Tanner Linsley
ef4c46f2be
labelMode Tooltips almost there!
2015-05-14 17:25:56 -06:00
Tanner Linsley
4ef57315da
Getting into 'label' hoverMode tooltips
2015-05-12 17:22:47 -06:00
Tanner Linsley
63e115e7a8
hoverMode: "single" tooltips
2015-05-12 15:47:24 -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
etimberg
d287a01b44
Make sure that the _start item is cleaned up during save.
2015-05-11 21:22:37 -04:00
Tanner Linsley
0e29cfdfda
Bar attempt #5
2015-05-11 18:12:44 -06:00
Tanner Linsley
cf07df07d6
Bar Attempt # 4
2015-05-08 16:20:21 -06:00
William Entriken
5443886ec3
Merge pull request #1068 from nnnick/animation-refactory
...
Animation refactory
2015-05-04 15:55:59 -04:00
William Entriken
a3d4bc0bfe
Merge pull request #851 from jtblin/master
...
Fix #507 - calculate container width and heigh without padding
2015-04-24 10:28:29 -04:00
Evert Timberg
b5692c8534
Merge pull request #1069 from mackuba/fix_endpoint
...
Prevent taking vertical space for X labels more than once
2015-04-17 06:33:42 -04:00
Kuba Suder
2e311896ad
prevent taking vertical space for x labels more than once
...
calculateXLabelRotation() subtracts space needed for x labels from
this.endPoint, but if this block is called more than once then the space
is subtracted more than once and the chart gets smaller and smaller with
every iteration
2015-04-16 22:23:17 +02:00
Evert Timberg
604d6bd4e3
Merge pull request #677 from rylanhalteman/fix-yLabel-padding
...
add 10 to yLabelWidth on set, rather than on use
2015-04-12 08:06:23 -04:00
