]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
10 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

10 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.

10 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.

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

10 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

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

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

10 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

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

10 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

10 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

10 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

10 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)

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

10 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

10 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

10 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

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

10 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

10 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

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

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

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

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

10 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.

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

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

10 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

10 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

10 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.

10 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.

10 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.

10 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

10 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

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

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

10 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

10 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

10 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.

10 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.

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

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

10 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

10 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

10 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

10 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)

10 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.

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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.

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

10 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

10 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

10 years agoTime scale now draws all ticks, instead of half of them 1473/head
Tanner Linsley [Mon, 21 Sep 2015 17:52:17 +0000 (11:52 -0600)] 
Time scale now draws all ticks, instead of half of them

Closes #1463

10 years agoMerge pull request #1471 from etimberg/fix/mouse-coordinates
Tanner Linsley [Mon, 21 Sep 2015 17:37:21 +0000 (11:37 -0600)] 
Merge pull request #1471 from etimberg/fix/mouse-coordinates

Convert screen coordinates into canvas coordinates when dealing with mouse events

10 years agoMerge pull request #1470 from etimberg/feature/updated_resize_fix
Tanner Linsley [Mon, 21 Sep 2015 17:36:43 +0000 (11:36 -0600)] 
Merge pull request #1470 from etimberg/feature/updated_resize_fix

Updated PR to replace #1467

10 years agoUpdate tests for new scale labels 1477/head
Evert Timberg [Sun, 20 Sep 2015 23:41:48 +0000 (19:41 -0400)] 
Update tests for new scale labels

10 years agoUpdate sample files
Evert Timberg [Sun, 20 Sep 2015 23:25:17 +0000 (19:25 -0400)] 
Update sample files

10 years agoTime scale has a label now
Evert Timberg [Sun, 20 Sep 2015 23:24:46 +0000 (19:24 -0400)] 
Time scale has a label now

10 years agoCategory scale has labels
Evert Timberg [Sun, 20 Sep 2015 23:18:59 +0000 (19:18 -0400)] 
Category scale has labels

10 years agoUpdate tests for new config options
Evert Timberg [Sun, 20 Sep 2015 23:06:34 +0000 (19:06 -0400)] 
Update tests for new config options

10 years agoLogarithmic scale now has labels
Evert Timberg [Sun, 20 Sep 2015 23:06:09 +0000 (19:06 -0400)] 
Logarithmic scale now has labels

10 years agoLinear scale has labels
Evert Timberg [Sun, 20 Sep 2015 22:59:58 +0000 (18:59 -0400)] 
Linear scale has labels

10 years agoConvert screen coordinates into canvas coordinates when dealing with mouse events 1471/head
Evert Timberg [Sun, 20 Sep 2015 21:57:27 +0000 (17:57 -0400)] 
Convert screen coordinates into canvas coordinates when dealing with mouse events

10 years agoUpdate charts with default aspect ratio of 1 where it makes sense. If the canvas... 1470/head
Evert Timberg [Sun, 20 Sep 2015 14:34:40 +0000 (10:34 -0400)] 
Update charts with default aspect ratio of 1 where it makes sense. If the canvas has no size specified, this will be used

10 years agoEnsure that radii are always >= 0 for doughnuts and polar area charts
Evert Timberg [Sun, 20 Sep 2015 14:33:36 +0000 (10:33 -0400)] 
Ensure that radii are always >= 0 for doughnuts and polar area charts

10 years agoPrevent a jump in the category scale when the labels need to rotate only when there...
Evert Timberg [Sun, 20 Sep 2015 14:32:43 +0000 (10:32 -0400)] 
Prevent a jump in the category scale when the labels need to rotate only when there is no margin yet applied.

10 years agoRemove responsive file since it is not necessary
Evert Timberg [Sun, 20 Sep 2015 14:30:43 +0000 (10:30 -0400)] 
Remove responsive file since it is not necessary

10 years agoUse hidden iframe to detect resize + obey max width when getting maximum size. Update...
Evert Timberg [Sun, 20 Sep 2015 14:30:12 +0000 (10:30 -0400)] 
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

10 years agoMerge pull request #1469 from nnnick/revert-1467-feature/resize_problems
Evert Timberg [Sat, 19 Sep 2015 21:53:35 +0000 (17:53 -0400)] 
Merge pull request #1469 from nnnick/revert-1467-feature/resize_problems

Revert "Fix resize problems when charts are initially hidden"

10 years agoRevert "Fix resize problems when charts are initially hidden" 1469/head
Evert Timberg [Sat, 19 Sep 2015 21:52:58 +0000 (17:52 -0400)] 
Revert "Fix resize problems when charts are initially hidden"

10 years agoMerge pull request #1465 from nnnick/v2.0-dev-time-scale-bars-and-combo
Tanner Linsley [Sat, 19 Sep 2015 00:59:58 +0000 (18:59 -0600)] 
Merge pull request #1465 from nnnick/v2.0-dev-time-scale-bars-and-combo

Bar and combo support for time scale

10 years agoMerge pull request #1467 from etimberg/feature/resize_problems
Tanner Linsley [Sat, 19 Sep 2015 00:59:39 +0000 (18:59 -0600)] 
Merge pull request #1467 from etimberg/feature/resize_problems

Fix resize problems when charts are initially hidden

10 years agoOnly store the original device context ratio once 1467/head
Evert Timberg [Fri, 18 Sep 2015 23:22:54 +0000 (19:22 -0400)] 
Only store the original device context ratio once

10 years agoMake sure that doughnut and polar area inner & outer radius is >= 0
Evert Timberg [Fri, 18 Sep 2015 22:59:55 +0000 (18:59 -0400)] 
Make sure that doughnut and polar area inner & outer radius is >= 0

10 years agoRemove core.responsive file. Responsiveness is added during initialization
Evert Timberg [Fri, 18 Sep 2015 22:44:00 +0000 (18:44 -0400)] 
Remove core.responsive file. Responsiveness is added during initialization

10 years agoRevert "Commit built version of scale algo changes"
Evert Timberg [Fri, 18 Sep 2015 22:41:45 +0000 (18:41 -0400)] 
Revert "Commit built version of scale algo changes"

This reverts commit a36a3f8c09b5424dbf4e140d08a5ceb24d7a5ecb.

10 years agoMerge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems
Evert Timberg [Fri, 18 Sep 2015 22:38:47 +0000 (18:38 -0400)] 
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems

Conflicts:
gulpfile.js

10 years agoBar and combo support for time scale 1465/head
Tanner Linsley [Fri, 18 Sep 2015 17:31:25 +0000 (11:31 -0600)] 
Bar and combo support for time scale

10 years agoUnit tests for logarithmic scale. Fixed some issues in stacked mode since it's not...
Evert Timberg [Fri, 18 Sep 2015 00:29:41 +0000 (20:29 -0400)] 
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.

10 years agoMerge pull request #1459 from nnnick/v2.0-dev-feature-time-axis
Tanner Linsley [Thu, 17 Sep 2015 21:54:44 +0000 (15:54 -0600)] 
Merge pull request #1459 from nnnick/v2.0-dev-feature-time-axis

V2.0 dev feature time axis

10 years agoMerge pull request #1458 from mennodekker/patch-1
Evert Timberg [Thu, 17 Sep 2015 11:24:15 +0000 (07:24 -0400)] 
Merge pull request #1458 from mennodekker/patch-1

Fixed issue #1163 hover.mode = 'dataset' no longer throws an error

10 years agoTabs to spaces + fixed error 1458/head
Menno Dekker [Thu, 17 Sep 2015 08:08:42 +0000 (10:08 +0200)] 
Tabs to spaces + fixed error

10 years agoHover on dataset now works just like hover on label
Menno Dekker [Thu, 17 Sep 2015 07:43:02 +0000 (09:43 +0200)] 
Hover on dataset now works just like hover on label

Fixed some errors in de hover on dataset mode, only tested on bar charts

10 years agoTime Scale Rewrite 1459/head
Tanner Linsley [Tue, 15 Sep 2015 17:40:01 +0000 (11:40 -0600)] 
Time Scale Rewrite

10 years agoMerge pull request #1456 from etimberg/feature/logarithmic_scale
Tanner Linsley [Tue, 15 Sep 2015 00:58:17 +0000 (18:58 -0600)] 
Merge pull request #1456 from etimberg/feature/logarithmic_scale

Logarithmic scale

10 years agoHide labels when the user returns null from the userCallback. This is the same as... 1456/head
Evert Timberg [Tue, 15 Sep 2015 00:34:49 +0000 (20:34 -0400)] 
Hide labels when the user returns null from the userCallback. This is the same as the category scale

10 years agoFixes to show all lines but not all labels. Added a variable in the template function...
Evert Timberg [Tue, 15 Sep 2015 00:32:23 +0000 (20:32 -0400)] 
Fixes to show all lines but not all labels. Added a variable in the template function to make debugging nicer.

10 years agoUpdate logarithmic sample. Created a new logarithmic sample using AC circuit simulati...
Evert Timberg [Mon, 14 Sep 2015 23:46:28 +0000 (19:46 -0400)] 
Update logarithmic sample. Created a new logarithmic sample using AC circuit simulation data of an RLC filter.

10 years agoRemove dead code in logarithmic scale. Fixed a padding bug that had previously been...
Evert Timberg [Mon, 14 Sep 2015 23:45:13 +0000 (19:45 -0400)] 
Remove dead code in logarithmic scale. Fixed a padding bug that had previously been fixed in the linear scale

10 years agoMerge remote-tracking branch 'upstream/v2.0-dev' into feature/logarithmic_scale
Evert Timberg [Mon, 14 Sep 2015 22:59:52 +0000 (18:59 -0400)] 
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/logarithmic_scale