Commit Graph

711 Commits

Author SHA1 Message Date
etimberg
082391e385 Update docs a bit for new items. Small updates for tooltip labels. 2015-10-18 18:14:56 -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
etimberg
ceaa4ff03f Add a helper function to reduce code size 2015-10-18 16:31:18 -04:00
etimberg
180209e55c Factor out getLabelForIndex into each scale so we can return appropriate data based on the scale type 2015-10-18 16:13:57 -04:00
etimberg
f650445ddc Use correct function to get afterBody lines for tooltip. 2015-10-18 10:39:54 -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
Tanner Linsley
b835d5f209 Tooltip Hooks 2015-10-12 14:51:00 -06:00
Tanner Linsley
ef5cec7f5e Tooltips now using new lineArray format 2015-10-06 20:40:25 -06:00
Tanner Linsley
0ac59b8a42 Update README.md 2015-09-30 15:32:16 -06:00
Tanner Linsley
82541248a1 Getting Started.... again. 2015-09-29 16:32:43 -06:00
Tanner Linsley
39340fa412 Update Getting Started and created Scales documentation 2015-09-29 13:29:53 -06:00
Tanner Linsley
cd4b6815c8 Dis Build 2015-09-29 10:55:05 -06:00
Tanner Linsley
e24406fc9d Ensure tickUnit and displayFormat set before format loop 2015-09-29 10:54:42 -06:00
Tanner Linsley
4c79c5756f Time Scale Samples updated to import moment beforehand 2015-09-28 12:46:25 -06:00
Tanner Linsley
5543041fcd Add Moment.js back into test reps 2015-09-28 12:45:53 -06:00
Tanner Linsley
c13d960df5 Built Dist Files (reduced lib to 122kb minified) 2015-09-28 11:30:52 -06:00
Tanner Linsley
5a31c50d4d Built Dist Files 2015-09-28 11:28:52 -06:00
Tanner Linsley
39b15b98e6 Removed moment from build, import color lib first 2015-09-28 11:28:34 -06:00
Tanner Linsley
63a0273591 Remove moment and onecolor as deps 2015-09-28 11:28:05 -06:00
Tanner Linsley
1bdf5edc24 Time Scale now requires and warns for Moment.js dep 2015-09-28 11:27:47 -06:00
etimberg
e6d15474df Commit built files after refactor 2015-09-28 07:45:50 -04:00
Evert Timberg
d09c25c0d5 Merge pull request #1488 from nnnick/v2.0-dev-refactor
V2.0 dev refactor
2015-09-27 21:50:25 -04: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
db3b5c1735 Fix broken helper test 2015-09-27 19:40:38 -04:00
Evert Timberg
7a0803cfd7 Fix line controller tests 2015-09-27 19:19:21 -04:00
Evert Timberg
4fd30e0c75 Last bar controller test fixes 2015-09-27 18:29:54 -04:00
Evert Timberg
80b2ffe3ee Fix bar controller unit tests 2015-09-27 18:28:09 -04:00
Evert Timberg
bc7d1d39fd Convert the radialLinear scale to derive from Core.scale. Radial linear scale is now fit using the scale service. Added tests for the radialLinear scale. 2015-09-27 11:58:20 -04:00
Evert Timberg
be4facdea9 Time scale tests. 2015-09-27 09:38:11 -04:00
Evert Timberg
5156e633ca Category scale tests 2015-09-26 16:52:14 -04:00
Evert Timberg
49a8b191c4 Update logX sample to use correct label callback 2015-09-26 16:50:59 -04:00
Evert Timberg
68f563fba4 Merge branch 'v2.0-dev-refactor' of https://github.com/nnnick/Chart.js into v2.0-dev-refactor 2015-09-25 21:04:57 -04:00
Evert Timberg
3d1e1b1605 Updated core.scale draw code with minor improvements and features that broke during integration (such as mirror option for labels). Updated linear and logarithmic tests. Update config merge to use scaleMerge since it prevents overriding the default entirely. 2015-09-25 21:04:45 -04:00
Tanner Linsley
b8d8ff8bae I guess, don't include the offset. Bars now align correctly. 2015-09-24 22:49:43 -06:00
Evert Timberg
cf944ae651 Make sure ticks are converted to strings. Handle this in the core. Updated linear scale tests & fixed some minor issues. Only 3 fails now in the linear scale. 2015-09-24 22:08:25 -04:00
Evert Timberg
2e2bbc9d52 Start to clean up the linear scale tests 2015-09-24 18:54:56 -04:00
Evert Timberg
f1b704a419 Fix scale fitting to give padding around the scale title & to account for label rotation 2015-09-24 18:53:48 -04:00
Tanner Linsley
505e6d780e Always includeOffset for bar controller 2015-09-24 15:46:10 -06:00
Tanner Linsley
7372987754 Add scaleLabel to core.scale 2015-09-24 15:45:56 -06: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
1f0ee92992 Polar Area now uses new scale.update method 2015-09-24 13:07:32 -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
4c2027aabb Horizontal Log Scale 2015-09-24 12:59:03 -06:00
Tanner Linsley
440703efff Log Scale Working Again 2015-09-24 12:31:18 -06:00
Tanner Linsley
d198157fb8 Time Scale working, troubleshooting log scale 2015-09-24 12:07:40 -06:00
Evert Timberg
d1067f956c Merge pull request #1485 from BenWoodford/label-patches
Label customisation fixes
2015-09-24 11:07:51 -04:00
Ben Woodford
b0679a80ae Fixed label padding not affecting x-axis label 2015-09-24 16:02:58 +01:00
Ben Woodford
d7ab51f29b Only rotate label while rotation is < maxRotation
Checking for <= maxRotation results in a labelRotation of 1 if maxRotation is 0, which doesn't make any sense (and also causes the text to be right aligned not centred)
2015-09-24 15:54:10 +01: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