374 Commits

Author SHA1 Message Date
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
Evert Timberg
162aaa993a Convert screen coordinates into canvas coordinates when dealing with mouse events 2015-09-20 17:57:27 -04:00
Evert Timberg
17cec5297d Update charts with default aspect ratio of 1 where it makes sense. If the canvas has no size specified, this will be used 2015-09-20 10:34:40 -04:00
Evert Timberg
8aa6288210 Ensure that radii are always >= 0 for doughnuts and polar area charts 2015-09-20 10:33:36 -04:00
Evert Timberg
8bddbff9aa Prevent a jump in the category scale when the labels need to rotate only when there is no margin yet applied. 2015-09-20 10:32:43 -04:00
Evert Timberg
814c2d7ffa Remove responsive file since it is not necessary 2015-09-20 10:30:43 -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
97cec8604a Only store the original device context ratio once 2015-09-18 19:22:54 -04:00
Evert Timberg
8d47693448 Make sure that doughnut and polar area inner & outer radius is >= 0 2015-09-18 18:59:55 -04:00
Evert Timberg
db5066cd23 Remove core.responsive file. Responsiveness is added during initialization 2015-09-18 18:44:00 -04: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
Evert Timberg
723c85320f Unit tests for logarithmic scale. Fixed some issues in stacked mode since it's not possible for a 0 crossing to occur with a log scale. 2015-09-17 20:29:41 -04: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
Menno Dekker
5047678799 Tabs to spaces + fixed error 2015-09-17 10:08:42 +02:00
Menno Dekker
5ff2b530b9 Hover on dataset now works just like hover on label
Fixed some errors in de hover on dataset mode, only tested on bar charts
2015-09-17 09:43:02 +02:00
Tanner Linsley
2598446d54 Time Scale Rewrite 2015-09-15 11:40:01 -06:00
Evert Timberg
eb657bce36 Hide labels when the user returns null from the userCallback. This is the same as the category scale 2015-09-14 20:34:49 -04: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
b172a382f1 Remove dead code in logarithmic scale. Fixed a padding bug that had previously been fixed in the linear scale 2015-09-14 19:45:13 -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
88d30d8c93 Let tooltips use time formatted labels if they exist 2015-09-11 12:20:32 -06:00
Tanner Linsley
c2a7e4c251 Time Scale Base 2015-09-10 22:48:48 -06:00
Evert Timberg
3f75aabbc5 Better scale fitting algorithm to handle when label rotation changes due to the application of margins on the scale 2015-09-05 13:27:06 -04:00
Evert Timberg
6b6c388a1a Helper for resize listener 2015-09-04 22:55:57 -04:00
Evert Timberg
4d51f21831 Merge pull request #1436 from honza889/reverse-radar
Reverse scale on radar / polar area
2015-09-02 17:46:35 -04:00
Jan Kalina
ef539bf4a7 Reverse scale on radar/polar area 2015-09-02 23:21:39 +02:00
etimberg
eabdbab89e If the element has a label, use that in the tooltip instead of the dataset label. 2015-08-31 21:49:51 -04:00
Evert Timberg
c8d5856216 Start testing the linear scale fit code 2015-08-30 21:49:39 -04:00
Evert Timberg
ce623075e3 Add line controller tests. Fixed an issue when the number of data points changes. When adding the tension to a point, get the same tension as the line if it has been overridden at the dataset level. When setting the hover style of a point, allow setting the radius independently of the regular radius. Use the hoverRadius property in point.custom or the dataset.pointHoverRadius. Allow setting the border width independently at the dataset level. Use dataset.pointHoverBorderWidth. This can be an array or a number. 2015-08-30 17:42:42 -04:00
Evert Timberg
8e9de00529 Doughnut controller tests 2015-08-30 14:56:48 -04:00
Evert Timberg
fcad4de670 Finish up bar controller tests 2015-08-30 10:42:00 -04:00
Evert Timberg
471618d287 Initial bar controller tests 2015-08-29 22:27:40 -04:00
Evert Timberg
eadfbbee6f Initial line element tests. Did not test the skipNull functionality since it seems to be broken. 2015-08-29 14:16:37 -04:00
Evert Timberg
17c075eb0e Arc element tests 2015-08-29 12:31:44 -04:00
Evert Timberg
26684b6371 Rectangle element tests 2015-08-29 08:53:42 -04:00
Evert Timberg
c09414cc40 First set of tests for point. Started on a mockContext object for testing. Still need to handle property setting better (fillStyle, strokeStyle, etc) 2015-08-28 23:09:58 -04:00
Evert Timberg
371bc8913f Start writing tests for core.helpers. Fix a number of small bugs found during testing 2015-08-28 22:32:56 -04:00
Tanner Linsley
bc3948ce59 Merge pull request #1408 from etimberg/feature/unit-test
Initial unit test framework + linear scale test starting point
2015-08-28 16:26:10 -06:00
Tanner Linsley
bade753fe3 Don't account for paddingLeft until after rotated 2015-08-28 15:12:35 -06:00
Evert Timberg
b4b3bf60b8 Remove wrong addition of padding 2015-08-23 17:17:21 -04: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
02abc46d5e Count the number of bars when determining the bar width 2015-08-22 16:56:02 -04:00
Evert Timberg
86ecca1c38 If setLineDash is not available, do not set it. 2015-08-22 16:13:19 -04:00
Evert Timberg
de413294ca Category scale now takes a smaller size if no labels are being displayed.
Updated linear scale code to use proper bottom padding. This is important when not displaying x axis labels
2015-08-22 14:30:30 -04:00
Evert Timberg
3dd2ee7968 Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into fix/template-caching 2015-08-15 10:57:13 -04:00