]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoOnly use active datasets in the tooltip body 1542/head
Tanner Linsley [Fri, 23 Oct 2015 18:40:56 +0000 (12:40 -0600)] 
Only use active datasets in the tooltip body

9 years agoTrack lastTooltipActive for change animations
Tanner Linsley [Fri, 23 Oct 2015 18:40:38 +0000 (12:40 -0600)] 
Track lastTooltipActive for change animations

Since we split up the hover and tooltips modes, both changes need to be
tracked for visual updates between the two.

9 years agoTime scale test fix for optional labels
etimberg [Thu, 22 Oct 2015 01:00:13 +0000 (21:00 -0400)] 
Time scale test fix for optional labels

9 years agotest fix
etimberg [Thu, 22 Oct 2015 00:47:22 +0000 (20:47 -0400)] 
test fix

9 years agoMerge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor
etimberg [Thu, 22 Oct 2015 00:18:23 +0000 (20:18 -0400)] 
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor

9 years agoMerge pull request #1551 from nnnick/travis-unit-test
Tanner Linsley [Wed, 21 Oct 2015 00:38:27 +0000 (18:38 -0600)] 
Merge pull request #1551 from nnnick/travis-unit-test

Unit tests work better with Travis

9 years agoFix JSHint errors 1551/head
etimberg [Wed, 21 Oct 2015 00:33:51 +0000 (20:33 -0400)] 
Fix JSHint errors

9 years agoFix 2 test fails
Evert Timberg [Wed, 21 Oct 2015 00:12:56 +0000 (20:12 -0400)] 
Fix 2 test fails

9 years agoTest in firefox on travis
Evert Timberg [Wed, 21 Oct 2015 00:08:41 +0000 (20:08 -0400)] 
Test in firefox on travis

9 years agoSupport min and max dates on time scale
Tanner Linsley [Tue, 20 Oct 2015 03:23:01 +0000 (21:23 -0600)] 
Support min and max dates on time scale

9 years agoLabels are now optional for the time scale.
etimberg [Mon, 19 Oct 2015 23:20:08 +0000 (19:20 -0400)] 
Labels are now optional for the time scale.

9 years agoFix 2 fails due to a bug fix for the scale label colour.
Evert Timberg [Sun, 18 Oct 2015 23:57:06 +0000 (19:57 -0400)] 
Fix 2 fails due to a bug fix for the scale label colour.

9 years agoDown to 3 test failures
Evert Timberg [Sun, 18 Oct 2015 23:48:57 +0000 (19:48 -0400)] 
Down to 3 test failures

9 years agoFix some test failures
Evert Timberg [Sun, 18 Oct 2015 23:34:56 +0000 (19:34 -0400)] 
Fix some test failures

9 years agoMerge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor
etimberg [Sun, 18 Oct 2015 22:17:39 +0000 (18:17 -0400)] 
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor

9 years agoUpdate docs a bit for new items. Small updates for tooltip labels.
etimberg [Sun, 18 Oct 2015 22:14:56 +0000 (18:14 -0400)] 
Update docs a bit for new items. Small updates for tooltip labels.

9 years agoTime scales now support passing in data as points. Added this to the time scale sampl...
etimberg [Sun, 18 Oct 2015 22:00:46 +0000 (18:00 -0400)] 
Time scales now support passing in data as points. Added this to the time scale sample file.

9 years agoAdd a helper function to reduce code size
etimberg [Sun, 18 Oct 2015 20:31:18 +0000 (16:31 -0400)] 
Add a helper function to reduce code size

9 years agoFactor out `getLabelForIndex` into each scale so we can return appropriate data based...
etimberg [Sun, 18 Oct 2015 20:13:57 +0000 (16:13 -0400)] 
Factor out `getLabelForIndex` into each scale so we can return appropriate data based on the scale type

9 years agoUse correct function to get `afterBody` lines for tooltip.
etimberg [Sun, 18 Oct 2015 14:39:54 +0000 (10:39 -0400)] 
Use correct function to get `afterBody` lines for tooltip.

9 years agoAll tooltip callbacks support arrays for lines, and no drawing invisible tooltips.
Tanner Linsley [Sat, 17 Oct 2015 21:53:33 +0000 (15:53 -0600)] 
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.

9 years agoMerge pull request #1512 from nnnick/v2.0-dev-bubble-controller
Evert Timberg [Sat, 17 Oct 2015 12:46:44 +0000 (08:46 -0400)] 
Merge pull request #1512 from nnnick/v2.0-dev-bubble-controller

Bubble Chart Type and Bubble Controller

9 years agoMerge pull request #1541 from nnnick/v2.0-dev-testing-fixes
Evert Timberg [Sat, 17 Oct 2015 12:30:37 +0000 (08:30 -0400)] 
Merge pull request #1541 from nnnick/v2.0-dev-testing-fixes

Testing fixes for time scale

9 years agoTesting fixes for time scale 1541/head
Tanner Linsley [Sat, 17 Oct 2015 03:14:07 +0000 (21:14 -0600)] 
Testing fixes for time scale

9 years agoMerge pull request #1540 from nnnick/fix/scale-tick-font-size
Tanner Linsley [Sat, 17 Oct 2015 02:48:46 +0000 (20:48 -0600)] 
Merge pull request #1540 from nnnick/fix/scale-tick-font-size

Draw scale ticks using correct font

9 years agoUse the correct font for the ticks. Ensure that scale labels fill in the correct... 1539/head 1540/head
etimberg [Sat, 17 Oct 2015 02:00:43 +0000 (22:00 -0400)] 
Use the correct font for the ticks. Ensure that scale labels fill in the correct colour.

9 years agoMerge pull request #1538 from lpaluszk/v2.0-dev
Evert Timberg [Sat, 17 Oct 2015 01:25:34 +0000 (21:25 -0400)] 
Merge pull request #1538 from lpaluszk/v2.0-dev

Fix HTMLIframeElement remove/removeNode issue in removeResizeListener…

9 years agoFix HTMLIframeElement remove/removeNode issue in removeResizeListener method 1538/head
Lucas Styles [Fri, 16 Oct 2015 23:35:47 +0000 (00:35 +0100)] 
Fix HTMLIframeElement remove/removeNode issue in removeResizeListener method

9 years agoMerge pull request #1526 from etimberg/fix/responsive-config-setting
Tanner Linsley [Tue, 13 Oct 2015 17:46:14 +0000 (11:46 -0600)] 
Merge pull request #1526 from etimberg/fix/responsive-config-setting

Use the correct merged responsive setting in the resize listener

9 years agoBefore labels can rotate, we need the appropriate left, right, top, & bottom attribut...
Evert Timberg [Tue, 13 Oct 2015 15:43:00 +0000 (11:43 -0400)] 
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.

9 years agoFix JSHint task
Evert Timberg [Tue, 13 Oct 2015 14:33:59 +0000 (10:33 -0400)] 
Fix JSHint task

9 years agoTooltip Hooks
Tanner Linsley [Mon, 12 Oct 2015 20:51:00 +0000 (14:51 -0600)] 
Tooltip Hooks

9 years agoMerge pull request #1525 from etimberg/fix/scale-merge
Tanner Linsley [Mon, 12 Oct 2015 17:51:21 +0000 (11:51 -0600)] 
Merge pull request #1525 from etimberg/fix/scale-merge

Merge scale settings at the correct time

9 years agoPut comment back in correct spot 1526/head
Evert Timberg [Mon, 12 Oct 2015 13:19:14 +0000 (09:19 -0400)] 
Put comment back in correct spot

9 years agoFix a race condition in the resize listener & use the correct merged config object...
Evert Timberg [Mon, 12 Oct 2015 13:16:49 +0000 (09:16 -0400)] 
Fix a race condition in the resize listener & use the correct merged config object for the responsive setting

9 years agoOnly merge scale defaults with the global scale defaults when getting the scale defau... 1525/head
Evert Timberg [Mon, 12 Oct 2015 12:58:03 +0000 (08:58 -0400)] 
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.

9 years agoMerge pull request #1517 from nnnick/feature/hide-datasets
Tanner Linsley [Thu, 8 Oct 2015 03:51:15 +0000 (21:51 -0600)] 
Merge pull request #1517 from nnnick/feature/hide-datasets

Now allows hiding individual datasets

9 years agoUpdate samples with some hidden datasets 1517/head
Evert Timberg [Wed, 7 Oct 2015 23:54:53 +0000 (19:54 -0400)] 
Update samples with some hidden datasets

9 years agoUpdate controllers to handle datasets that are not visible
Evert Timberg [Wed, 7 Oct 2015 23:54:11 +0000 (19:54 -0400)] 
Update controllers to handle datasets that are not visible

9 years agoScales will only consider visible datasets when calculating data max and min values
Evert Timberg [Wed, 7 Oct 2015 23:37:53 +0000 (19:37 -0400)] 
Scales will only consider visible datasets when calculating data max and min values

9 years agoHelper to determine if a dataset is visible or not
Evert Timberg [Wed, 7 Oct 2015 23:10:10 +0000 (19:10 -0400)] 
Helper to determine if a dataset is visible or not

9 years agoTooltips now using new lineArray format
Tanner Linsley [Wed, 7 Oct 2015 02:40:25 +0000 (20:40 -0600)] 
Tooltips now using new lineArray format

9 years agoBubble Chart Type and Bubble Controller 1512/head
Tanner Linsley [Mon, 5 Oct 2015 18:40:28 +0000 (12:40 -0600)] 
Bubble Chart Type and Bubble Controller

9 years agoUpdate README.md
Tanner Linsley [Wed, 30 Sep 2015 21:32:16 +0000 (15:32 -0600)] 
Update README.md

9 years agoGetting Started.... again. 2.0.0-alpha4
Tanner Linsley [Tue, 29 Sep 2015 22:32:43 +0000 (16:32 -0600)] 
Getting Started.... again.

9 years agoUpdate Getting Started and created Scales documentation
Tanner Linsley [Tue, 29 Sep 2015 19:29:53 +0000 (13:29 -0600)] 
Update Getting Started and created Scales documentation

9 years agoDis Build
Tanner Linsley [Tue, 29 Sep 2015 16:55:05 +0000 (10:55 -0600)] 
Dis Build

9 years agoEnsure tickUnit and displayFormat set before format loop
Tanner Linsley [Tue, 29 Sep 2015 16:54:42 +0000 (10:54 -0600)] 
Ensure tickUnit and displayFormat set before format loop

9 years agoTime Scale Samples updated to import moment beforehand
Tanner Linsley [Mon, 28 Sep 2015 18:46:25 +0000 (12:46 -0600)] 
Time Scale Samples updated to import moment beforehand

9 years agoAdd Moment.js back into test reps
Tanner Linsley [Mon, 28 Sep 2015 18:45:53 +0000 (12:45 -0600)] 
Add Moment.js back into test reps

9 years agoBuilt Dist Files (reduced lib to 122kb minified)
Tanner Linsley [Mon, 28 Sep 2015 17:30:52 +0000 (11:30 -0600)] 
Built Dist Files (reduced lib to 122kb minified)

9 years agoBuilt Dist Files
Tanner Linsley [Mon, 28 Sep 2015 17:28:52 +0000 (11:28 -0600)] 
Built Dist Files

9 years agoRemoved moment from build, import color lib first
Tanner Linsley [Mon, 28 Sep 2015 17:28:34 +0000 (11:28 -0600)] 
Removed moment from build, import color lib first

9 years agoRemove moment and onecolor as deps
Tanner Linsley [Mon, 28 Sep 2015 17:28:05 +0000 (11:28 -0600)] 
Remove moment and onecolor as deps

9 years agoTime Scale now requires and warns for Moment.js dep
Tanner Linsley [Mon, 28 Sep 2015 17:27:47 +0000 (11:27 -0600)] 
Time Scale now requires and warns for Moment.js dep

9 years agoCommit built files after refactor
etimberg [Mon, 28 Sep 2015 11:45:50 +0000 (07:45 -0400)] 
Commit built files after refactor

9 years agoMerge pull request #1488 from nnnick/v2.0-dev-refactor
Evert Timberg [Mon, 28 Sep 2015 01:50:25 +0000 (21:50 -0400)] 
Merge pull request #1488 from nnnick/v2.0-dev-refactor

V2.0 dev refactor

9 years agoRemoved the line scale override file since functionality no longer directly exists... 1488/head
Evert Timberg [Mon, 28 Sep 2015 01:34:16 +0000 (21:34 -0400)] 
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

9 years agoFix broken helper test
Evert Timberg [Sun, 27 Sep 2015 23:40:38 +0000 (19:40 -0400)] 
Fix broken helper test

9 years agoFix line controller tests
Evert Timberg [Sun, 27 Sep 2015 23:19:21 +0000 (19:19 -0400)] 
Fix line controller tests

9 years agoLast bar controller test fixes
Evert Timberg [Sun, 27 Sep 2015 22:29:54 +0000 (18:29 -0400)] 
Last bar controller test fixes

9 years agoFix bar controller unit tests
Evert Timberg [Sun, 27 Sep 2015 22:28:09 +0000 (18:28 -0400)] 
Fix bar controller unit tests

9 years agoConvert the radialLinear scale to derive from Core.scale. Radial linear scale is...
Evert Timberg [Sun, 27 Sep 2015 15:58:20 +0000 (11:58 -0400)] 
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.

9 years agoTime scale tests.
Evert Timberg [Sun, 27 Sep 2015 13:38:11 +0000 (09:38 -0400)] 
Time scale tests.

9 years agoCategory scale tests
Evert Timberg [Sat, 26 Sep 2015 20:52:14 +0000 (16:52 -0400)] 
Category scale tests

9 years agoUpdate logX sample to use correct label callback
Evert Timberg [Sat, 26 Sep 2015 20:50:59 +0000 (16:50 -0400)] 
Update logX sample to use correct label callback

9 years agoMerge branch 'v2.0-dev-refactor' of https://github.com/nnnick/Chart.js into v2.0...
Evert Timberg [Sat, 26 Sep 2015 01:04:57 +0000 (21:04 -0400)] 
Merge branch 'v2.0-dev-refactor' of https://github.com/nnnick/Chart.js into v2.0-dev-refactor

9 years agoUpdated core.scale draw code with minor improvements and features that broke during...
Evert Timberg [Sat, 26 Sep 2015 01:04:45 +0000 (21:04 -0400)] 
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.

9 years agoI guess, don't include the offset. Bars now align correctly.
Tanner Linsley [Fri, 25 Sep 2015 04:49:43 +0000 (22:49 -0600)] 
I guess, don't include the offset. Bars now align correctly.

9 years agoMake sure ticks are converted to strings. Handle this in the core. Updated linear...
Evert Timberg [Fri, 25 Sep 2015 02:08:25 +0000 (22:08 -0400)] 
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.

9 years agoStart to clean up the linear scale tests
Evert Timberg [Thu, 24 Sep 2015 22:54:56 +0000 (18:54 -0400)] 
Start to clean up the linear scale tests

9 years agoFix scale fitting to give padding around the scale title & to account for label rotation
Evert Timberg [Thu, 24 Sep 2015 22:53:48 +0000 (18:53 -0400)] 
Fix scale fitting to give padding around the scale title & to account for label rotation

9 years agoAlways includeOffset for bar controller
Tanner Linsley [Thu, 24 Sep 2015 21:46:10 +0000 (15:46 -0600)] 
Always includeOffset for bar controller

9 years agoAdd scaleLabel to core.scale
Tanner Linsley [Thu, 24 Sep 2015 21:45:56 +0000 (15:45 -0600)] 
Add scaleLabel to core.scale

9 years agoMerge branch 'v2.0-dev' into v2.0-dev-refactor
Tanner Linsley [Thu, 24 Sep 2015 20:34:26 +0000 (14:34 -0600)] 
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

9 years agoPolar Area now uses new scale.update method
Tanner Linsley [Thu, 24 Sep 2015 19:07:32 +0000 (13:07 -0600)] 
Polar Area now uses new scale.update method

9 years agoPie.customtooltips is outdated. Removing for now.
Tanner Linsley [Thu, 24 Sep 2015 19:05:46 +0000 (13:05 -0600)] 
Pie.customtooltips is outdated. Removing for now.

9 years agoDoughnut.color is outdated. Removing for now.
Tanner Linsley [Thu, 24 Sep 2015 19:01:07 +0000 (13:01 -0600)] 
Doughnut.color is outdated.  Removing for now.

9 years agoHorizontal Log Scale
Tanner Linsley [Thu, 24 Sep 2015 18:59:03 +0000 (12:59 -0600)] 
Horizontal Log Scale

9 years agoLog Scale Working Again
Tanner Linsley [Thu, 24 Sep 2015 18:31:18 +0000 (12:31 -0600)] 
Log Scale Working Again

9 years agoTime Scale working, troubleshooting log scale
Tanner Linsley [Thu, 24 Sep 2015 18:07:40 +0000 (12:07 -0600)] 
Time Scale working, troubleshooting log scale

9 years agoMerge pull request #1485 from BenWoodford/label-patches
Evert Timberg [Thu, 24 Sep 2015 15:07:51 +0000 (11:07 -0400)] 
Merge pull request #1485 from BenWoodford/label-patches

Label customisation fixes

9 years agoFixed label padding not affecting x-axis label 1485/head
Ben Woodford [Thu, 24 Sep 2015 15:02:58 +0000 (16:02 +0100)] 
Fixed label padding not affecting x-axis label

9 years agoOnly rotate label while rotation is < maxRotation
Ben Woodford [Thu, 24 Sep 2015 14:54:10 +0000 (15:54 +0100)] 
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)

9 years agocheckpoint for the morning check
Tanner Linsley [Thu, 24 Sep 2015 08:25:21 +0000 (02:25 -0600)] 
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.

9 years agoVertical Scales are a bit better now
Tanner Linsley [Thu, 24 Sep 2015 05:23:20 +0000 (23:23 -0600)] 
Vertical Scales are a bit better now

9 years agoStuck on shared vertical scale draw logic
Tanner Linsley [Thu, 24 Sep 2015 03:52:31 +0000 (21:52 -0600)] 
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

9 years agoCheckpoint 1, Pew!!!!
Tanner Linsley [Wed, 23 Sep 2015 01:31:26 +0000 (19:31 -0600)] 
Checkpoint 1, Pew!!!!

9 years agoMerge pull request #1480 from etimberg/fix/retina-scale-issue
Tanner Linsley [Tue, 22 Sep 2015 23:28:35 +0000 (17:28 -0600)] 
Merge pull request #1480 from etimberg/fix/retina-scale-issue

Fixes some retina issues introduced into the v2 codeline

9 years agoDon't increase canvas css size during a retina scale. Reset the canvas style exactly... 1480/head
Evert Timberg [Tue, 22 Sep 2015 23:22:55 +0000 (19:22 -0400)] 
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

9 years agoMerge pull request #1478 from etimberg/feature/data-change-api
Evert Timberg [Tue, 22 Sep 2015 16:10:51 +0000 (12:10 -0400)] 
Merge pull request #1478 from etimberg/feature/data-change-api

Data change must only happen by changing the data object

9 years agoUpdate samples to no longer use old functions and instead modify the data directly 1478/head
Evert Timberg [Tue, 22 Sep 2015 01:00:58 +0000 (21:00 -0400)] 
Update samples to no longer use old functions and instead modify the data directly

9 years agoTest missed in last check-in
Evert Timberg [Tue, 22 Sep 2015 01:00:09 +0000 (21:00 -0400)] 
Test missed in last check-in

9 years agoRemove unneeded functions from core controller. Updated dataset controllers to have...
Evert Timberg [Tue, 22 Sep 2015 00:59:53 +0000 (20:59 -0400)] 
Remove unneeded functions from core controller. Updated dataset controllers to have a separate function to update the meta data for each dataset

9 years agoMerge pull request #1477 from etimberg/feature/scale-labels
Tanner Linsley [Mon, 21 Sep 2015 23:52:09 +0000 (17:52 -0600)] 
Merge pull request #1477 from etimberg/feature/scale-labels

Scale Labels

9 years agoEnsure bar width at least 1px
Tanner Linsley [Mon, 21 Sep 2015 19:17:27 +0000 (13:17 -0600)] 
Ensure bar width at least 1px

9 years agoMerge pull request #1474 from nnnick/v2.0-feature-dynamic-bar-spacing
Tanner Linsley [Mon, 21 Sep 2015 19:08:09 +0000 (13:08 -0600)] 
Merge pull request #1474 from nnnick/v2.0-feature-dynamic-bar-spacing

Bar spacing is now dynamic at small sizes.

9 years agoTime scale support 1474/head
Tanner Linsley [Mon, 21 Sep 2015 19:04:41 +0000 (13:04 -0600)] 
Time scale support

9 years agoBar spacing is now dynamic at small sizes.
Tanner Linsley [Mon, 21 Sep 2015 18:57:04 +0000 (12:57 -0600)] 
Bar spacing is now dynamic at small sizes.

Closes #1468

9 years agoMerge pull request #1473 from nnnick/v2.0-dev-timescale-fix
Tanner Linsley [Mon, 21 Sep 2015 17:55:51 +0000 (11:55 -0600)] 
Merge pull request #1473 from nnnick/v2.0-dev-timescale-fix

Time scale now draws all ticks, instead of half of them