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
Tanner Linsley
322abd4361
Merge pull request #1476 from nnnick/v1.0-readme-update
...
Update v1.x readme to reflect release status
2015-09-24 22:34:00 -06:00
Tanner Linsley
f992ddd0d7
Update README.md
2015-09-24 22:33:05 -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
Tanner Linsley
e2a96501b7
Vertical Scales are a bit better now
2015-09-23 23:23:20 -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
Tanner Linsley
36493e042e
Merge pull request #1480 from etimberg/fix/retina-scale-issue
...
Fixes some retina issues introduced into the v2 codeline
2015-09-22 17:28:35 -06:00
Evert Timberg
4a093196b8
Don't increase canvas css size during a retina scale. Reset the canvas style exactly as it was set before during destroy. Ensure coordinates are translated over correctly into model coordinates. Fixed a bug during destroy when unscaling the canvas
2015-09-22 19:22:55 -04:00
Evert Timberg
cd0b95d383
Merge pull request #1478 from etimberg/feature/data-change-api
...
Data change must only happen by changing the data object
2015-09-22 12:10:51 -04: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
Evert Timberg
4e536c523e
Test missed in last check-in
2015-09-21 21:00:09 -04:00
Evert Timberg
416a6ac1bd
Remove unneeded functions from core controller. Updated dataset controllers to have a separate function to update the meta data for each dataset
2015-09-21 20:59:53 -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
407eb846d0
Update v1.x readme to reflect release status
2015-09-21 14:28:10 -06:00
Tanner Linsley
8c94ae0441
Ensure bar width at least 1px
2015-09-21 13:17:27 -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
e3e66d2425
Time scale support
2015-09-21 13:04:41 -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
3ce06ab387
Merge pull request #1473 from nnnick/v2.0-dev-timescale-fix
...
Time scale now draws all ticks, instead of half of them
2015-09-21 11:55:51 -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
Tanner Linsley
848710b447
Merge pull request #1471 from etimberg/fix/mouse-coordinates
...
Convert screen coordinates into canvas coordinates when dealing with mouse events
2015-09-21 11:37:21 -06:00