etimberg
24e8fe3a4b
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor
2015-10-21 20:18:23 -04:00
etimberg
e46a2cb074
Fix JSHint errors
2015-10-20 20:33:51 -04:00
Evert Timberg
86a52d0302
Fix some test failures
2015-10-18 19:34:56 -04:00
etimberg
2b057cf690
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor
2015-10-18 18:17:39 -04:00
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
etimberg
3699addf16
Use the correct font for the ticks. Ensure that scale labels fill in the correct colour.
2015-10-16 22:00:43 -04:00
Lucas Styles
4a48e19cac
Fix HTMLIframeElement remove/removeNode issue in removeResizeListener method
2015-10-17 00:35:47 +01:00
Tanner Linsley
6c4c4695d9
Merge pull request #1526 from etimberg/fix/responsive-config-setting
...
Use the correct merged responsive setting in the resize listener
2015-10-13 11:46:14 -06:00
Evert Timberg
e39298db3c
Before labels can rotate, we need the appropriate left, right, top, & bottom attributes of the scale set with default values so that tick spacing can be determined. After ensuring that this happens, tests needed to be updated. Added unit testing for the scale service.
2015-10-13 11:43:00 -04:00
Tanner Linsley
b835d5f209
Tooltip Hooks
2015-10-12 14:51:00 -06:00
Evert Timberg
93ee8f85f6
Put comment back in correct spot
2015-10-12 09:19:14 -04:00
Evert Timberg
1232ca53f0
Fix a race condition in the resize listener & use the correct merged config object for the responsive setting
2015-10-12 09:16:49 -04:00
Evert Timberg
a756e0de15
Only merge scale defaults with the global scale defaults when getting the scale defaults. Otherwise, the user does not have the ability to change them via the global settings since registration occurs when the library is loaded.
2015-10-12 08:58:03 -04:00
Evert Timberg
b36c8ff788
Update controllers to handle datasets that are not visible
2015-10-07 19:54:11 -04:00
Evert Timberg
22e7934804
Helper to determine if a dataset is visible or not
2015-10-07 19:10:10 -04:00
Tanner Linsley
ef5cec7f5e
Tooltips now using new lineArray format
2015-10-06 20:40:25 -06: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
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
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
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
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
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
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
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
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
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
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
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
Evert Timberg
97cec8604a
Only store the original device context ratio once
2015-09-18 19:22:54 -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
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
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
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