]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoFix test failures 1724/head
etimberg [Wed, 2 Dec 2015 02:07:53 +0000 (21:07 -0500)] 
Fix test failures

9 years agoUpdate scale fitting to prevent horizontal scales from jumping around.
etimberg [Wed, 2 Dec 2015 02:01:13 +0000 (21:01 -0500)] 
Update scale fitting to prevent horizontal scales from jumping around.

9 years agoTime scale will now scale units. For example, it will try 1hr then 2hrs then 3 hrs...
etimberg [Wed, 2 Dec 2015 01:02:44 +0000 (20:02 -0500)] 
Time scale will now scale units. For example, it will try 1hr then 2hrs then 3 hrs then 6 hrs then 12 hrs ... until it finds a unit that fits.

9 years agoUpdate built files 2.0.0-beta1
etimberg [Tue, 1 Dec 2015 02:35:09 +0000 (21:35 -0500)] 
Update built files

9 years agoMerge pull request #1720 from nnnick/fix/1718
Evert Timberg [Tue, 1 Dec 2015 01:50:00 +0000 (20:50 -0500)] 
Merge pull request #1720 from nnnick/fix/1718

Allow the user to change the time label display formats

9 years agoUpdate docs 1720/head
etimberg [Tue, 1 Dec 2015 01:47:49 +0000 (20:47 -0500)] 
Update docs

9 years agoAllow the user to change the time label display formats
etimberg [Tue, 1 Dec 2015 01:42:48 +0000 (20:42 -0500)] 
Allow the user to change the time label display formats

9 years agoNew built files + some sample file updates
Evert Timberg [Sun, 29 Nov 2015 18:33:24 +0000 (13:33 -0500)] 
New built files + some sample file updates

9 years agoMerge pull request #1713 from nnnick/v2.0-beta1-docs
Evert Timberg [Sun, 29 Nov 2015 18:13:01 +0000 (13:13 -0500)] 
Merge pull request #1713 from nnnick/v2.0-beta1-docs

Initial docs to get ready for beta1

9 years agoMerge branch 'v2.0-dev' into v2.0-beta1-docs 1713/head
Evert Timberg [Sun, 29 Nov 2015 16:32:57 +0000 (11:32 -0500)] 
Merge branch 'v2.0-dev' into v2.0-beta1-docs

Conflicts:
docs/01-Scales.md

9 years agoInitial update to line and bar docs
Evert Timberg [Sun, 29 Nov 2015 16:30:39 +0000 (11:30 -0500)] 
Initial update to line and bar docs

9 years agoInitial update to scale documentation
Evert Timberg [Sun, 29 Nov 2015 15:58:01 +0000 (10:58 -0500)] 
Initial update to scale documentation

9 years agoMerge pull request #1696 from nnnick/fix/1688
Evert Timberg [Sun, 29 Nov 2015 15:16:25 +0000 (10:16 -0500)] 
Merge pull request #1696 from nnnick/fix/1688

When tooltip opacity is less than 1e-3, round to 0.

9 years agoMerge pull request #1695 from nnnick/fix/consistent-display-parameters
Evert Timberg [Sun, 29 Nov 2015 15:16:20 +0000 (10:16 -0500)] 
Merge pull request #1695 from nnnick/fix/consistent-display-parameters

Fix inconsistent display parameters

9 years agoUpdate getting started docs
Evert Timberg [Sun, 29 Nov 2015 15:04:46 +0000 (10:04 -0500)] 
Update getting started docs

9 years agoAnother build
Evert Timberg [Fri, 27 Nov 2015 22:37:42 +0000 (17:37 -0500)] 
Another build

9 years agoMerge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into v2.0-dev
Evert Timberg [Fri, 27 Nov 2015 22:37:14 +0000 (17:37 -0500)] 
Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into v2.0-dev

9 years agoPush up new built files
Evert Timberg [Fri, 27 Nov 2015 22:35:34 +0000 (17:35 -0500)] 
Push up new built files

9 years agoMerge pull request #1704 from Marius2805/v2.0-dev
Evert Timberg [Fri, 27 Nov 2015 12:25:22 +0000 (07:25 -0500)] 
Merge pull request #1704 from Marius2805/v2.0-dev

V2.0 Docs: Fixed wrong example data structure for Pie/Doughnut Chart

9 years agoMerge pull request #1703 from wuchangming/v2.0-dev
Evert Timberg [Fri, 27 Nov 2015 12:24:53 +0000 (07:24 -0500)] 
Merge pull request #1703 from wuchangming/v2.0-dev

V2.0 dev  Bug in handler event.type='touchend'

9 years agoFixed wrong structure of example data 1704/head
Marius Meißner [Fri, 27 Nov 2015 07:34:32 +0000 (08:34 +0100)] 
Fixed wrong structure of example data

9 years agoBug in handler event.type='touchend' 1703/head
wuchangming [Fri, 27 Nov 2015 03:16:54 +0000 (11:16 +0800)] 
Bug in handler event.type='touchend'

In Chorme.
while event.type = "touchend” ,  event.touches is a empty TouchList,
event.touches.length === 0

9 years agoMerge remote-tracking branch 'nnnick/v2.0-dev' into v2.0-dev
wuchangming [Fri, 27 Nov 2015 00:50:55 +0000 (08:50 +0800)] 
Merge remote-tracking branch 'nnnick/v2.0-dev' into v2.0-dev

9 years agoMerge pull request #1702 from wuchangming/v2.0-dev
Evert Timberg [Thu, 26 Nov 2015 12:41:23 +0000 (07:41 -0500)] 
Merge pull request #1702 from wuchangming/v2.0-dev

no such file

9 years agono such file 1702/head
wuchangming [Thu, 26 Nov 2015 11:35:25 +0000 (19:35 +0800)] 
no such file

9 years agoWhen opacity is less than 1e-3, round to 0. IE11/Edge had problems with very small... 1696/head
Evert Timberg [Thu, 26 Nov 2015 00:31:26 +0000 (19:31 -0500)] 
When opacity is less than 1e-3, round to 0. IE11/Edge had problems with very small opacities on the order of 1e-10.

9 years agoUpdate docs 1695/head 1792/head
Evert Timberg [Wed, 25 Nov 2015 00:21:09 +0000 (19:21 -0500)] 
Update docs

9 years agoChange scale `show` properties to `display` and update tests
Evert Timberg [Wed, 25 Nov 2015 00:18:15 +0000 (19:18 -0500)] 
Change scale `show` properties to `display` and update tests

9 years agoMerge pull request #1693 from wcatron/basic-documentation
Evert Timberg [Tue, 24 Nov 2015 23:22:33 +0000 (18:22 -0500)] 
Merge pull request #1693 from wcatron/basic-documentation

Add descriptions for options in documentation.

9 years agoAdd more explanation of bar and category percentage. 1693/head
wcatron [Tue, 24 Nov 2015 19:25:15 +0000 (14:25 -0500)] 
Add more explanation of bar and category percentage.

9 years agoFill out descriptions and add link to scales.
wcatron [Tue, 24 Nov 2015 19:06:38 +0000 (14:06 -0500)] 
Fill out descriptions and add link to scales.

9 years agoAdd full description text for scales.
wcatron [Tue, 24 Nov 2015 18:36:48 +0000 (13:36 -0500)] 
Add full description text for scales.

9 years agoMerge pull request #1689 from wcatron/basic-documentation
Evert Timberg [Tue, 24 Nov 2015 13:03:26 +0000 (08:03 -0500)] 
Merge pull request #1689 from wcatron/basic-documentation

Update getting started example code.

9 years agoMerge pull request #1690 from byCedric/fix/canvas-dimensions-ie10-ie9
Evert Timberg [Tue, 24 Nov 2015 13:00:41 +0000 (08:00 -0500)] 
Merge pull request #1690 from byCedric/fix/canvas-dimensions-ie10-ie9

Updated retina scale to allow rendering in IE10 and IE9.

9 years agoStored pixel ratio in a variable with a fallback value for browsers that doesn't... 1690/head
Cedric van Putten [Tue, 24 Nov 2015 10:26:24 +0000 (11:26 +0100)] 
Stored pixel ratio in a variable with a fallback value for browsers that doesn't support `window.devicePixelRatio` fixing rendering issues for IE10 and IE9. (issue #1622)

9 years agoAdd suggested min and max to documentation. 1689/head
wcatron [Tue, 24 Nov 2015 07:28:15 +0000 (02:28 -0500)] 
Add suggested min and max to documentation.

9 years agoCreate very simple getting started example code.
wcatron [Tue, 24 Nov 2015 04:58:14 +0000 (23:58 -0500)] 
Create very simple getting started example code.

9 years agoMerge pull request #1687 from wcatron/basic-documentation
Evert Timberg [Tue, 24 Nov 2015 03:37:04 +0000 (22:37 -0500)] 
Merge pull request #1687 from wcatron/basic-documentation

Converting documentation to tables - radar, polar, and pie

9 years agoUpdate remainder of tables for radar, polar, and pie. 1687/head
wcatron [Tue, 24 Nov 2015 00:32:38 +0000 (19:32 -0500)] 
Update remainder of tables for radar, polar, and pie.

9 years agoMerge pull request #1684 from wcatron/basic-documentation
Evert Timberg [Mon, 23 Nov 2015 23:16:27 +0000 (18:16 -0500)] 
Merge pull request #1684 from wcatron/basic-documentation

Converting documentation to tables - scales, line, and bar

9 years agoClean up periods and comments.
wcatron [Mon, 23 Nov 2015 17:09:40 +0000 (12:09 -0500)] 
Clean up periods and comments.

9 years agoUpdate options to tables, update example for bar. 1684/head
wcatron [Mon, 23 Nov 2015 17:03:38 +0000 (12:03 -0500)] 
Update options to tables, update example for bar.

9 years agoFix typo
Evert Timberg [Sun, 22 Nov 2015 18:26:01 +0000 (13:26 -0500)] 
Fix typo

9 years agoMerge pull request #1669 from wcatron/basic-documentation
Evert Timberg [Sun, 22 Nov 2015 18:12:31 +0000 (13:12 -0500)] 
Merge pull request #1669 from wcatron/basic-documentation

Update getting started documentation default options w/ table.

9 years agoMerge pull request #1670 from nnnick/fix/1643
Evert Timberg [Sat, 21 Nov 2015 14:20:58 +0000 (09:20 -0500)] 
Merge pull request #1670 from nnnick/fix/1643

Fixes scatter and bubble chart tooltips

9 years agoRemove commented code 1670/head
Evert Timberg [Fri, 20 Nov 2015 02:20:04 +0000 (21:20 -0500)] 
Remove commented code

9 years agoUpdate default tooltip configs for scatter charts. Made scatter charts a first class...
Evert Timberg [Fri, 20 Nov 2015 02:15:59 +0000 (21:15 -0500)] 
Update default tooltip configs for scatter charts. Made scatter charts a first class chart type.

9 years agoUpdate default tooltip callbacks for bubble charts
Evert Timberg [Fri, 20 Nov 2015 02:12:23 +0000 (21:12 -0500)] 
Update default tooltip callbacks for bubble charts

9 years agoUpdate line chart documentation options to table.
wcatron [Fri, 20 Nov 2015 00:55:12 +0000 (19:55 -0500)] 
Update line chart documentation options to table.

9 years agoUpdate getting started documentation default options w/ table. 1669/head
wcatron [Thu, 19 Nov 2015 21:14:13 +0000 (16:14 -0500)] 
Update getting started documentation default options w/ table.

9 years agoMerge pull request #1668 from wcatron/basic-documentation
Evert Timberg [Thu, 19 Nov 2015 18:39:48 +0000 (13:39 -0500)] 
Merge pull request #1668 from wcatron/basic-documentation

Updates basic documentation for bar, radar, and doughnut.

9 years agoUpdate doughnut documentation for intiializer and data. 1668/head
wcatron [Thu, 19 Nov 2015 16:47:47 +0000 (11:47 -0500)] 
Update doughnut documentation for intiializer and data.

9 years agoUpdate Rader initializer and data structure keys.
wcatron [Thu, 19 Nov 2015 16:43:00 +0000 (11:43 -0500)] 
Update Rader initializer and data structure keys.

9 years agoUpdate initializer documentation for Bar.
wcatron [Thu, 19 Nov 2015 16:35:38 +0000 (11:35 -0500)] 
Update initializer documentation for Bar.

9 years agoMerge pull request #1667 from nnnick/fix/pie-legend
Evert Timberg [Thu, 19 Nov 2015 02:38:52 +0000 (21:38 -0500)] 
Merge pull request #1667 from nnnick/fix/pie-legend

Pie and Polar area legend functions

9 years agoMerge pull request #1662 from nnnick/fix/string-linear-data
Evert Timberg [Thu, 19 Nov 2015 02:35:56 +0000 (21:35 -0500)] 
Merge pull request #1662 from nnnick/fix/string-linear-data

Handle data as strings in numeric scales

9 years agoFix polar area legends 1667/head
etimberg [Thu, 19 Nov 2015 02:30:16 +0000 (21:30 -0500)] 
Fix polar area legends

9 years agofix pie & doughnut legend
etimberg [Thu, 19 Nov 2015 02:24:49 +0000 (21:24 -0500)] 
fix pie & doughnut legend

9 years agoMake sure data is converted to a number in scales when determining min and max. Add... 1662/head
Evert Timberg [Tue, 17 Nov 2015 23:43:18 +0000 (18:43 -0500)] 
Make sure data is converted to a number in scales when determining min and max. Add tests for this condition to linear, radialLinear, and logarithmic scales.

9 years agoFix tests
Evert Timberg [Tue, 17 Nov 2015 23:38:19 +0000 (18:38 -0500)] 
Fix tests

9 years agoMerge pull request #1642 from nnnick/fix/1527
Tanner Linsley [Mon, 16 Nov 2015 23:10:24 +0000 (16:10 -0700)] 
Merge pull request #1642 from nnnick/fix/1527

Doughnut, polar area, and radar samples should use the same canvas style

9 years agoMerge pull request #1645 from nnnick/fix/null-callback
Tanner Linsley [Mon, 16 Nov 2015 23:10:16 +0000 (16:10 -0700)] 
Merge pull request #1645 from nnnick/fix/null-callback

Hide lines for which the tick label callback returns null or undefined

9 years agoMerge pull request #1646 from nnnick/fix/1640
Tanner Linsley [Mon, 16 Nov 2015 23:10:01 +0000 (16:10 -0700)] 
Merge pull request #1646 from nnnick/fix/1640

Can now replace entire chart data object on the fly

9 years agoMerge pull request #1647 from nnnick/fix/1324
Tanner Linsley [Mon, 16 Nov 2015 23:09:53 +0000 (16:09 -0700)] 
Merge pull request #1647 from nnnick/fix/1324

Fall back to line settings for points if necessary

9 years agoMerge pull request #1644 from nnnick/fix/touch-events
Tanner Linsley [Mon, 16 Nov 2015 23:09:41 +0000 (16:09 -0700)] 
Merge pull request #1644 from nnnick/fix/touch-events

Do not bind to touchend events for tooltips

9 years agoMerge pull request #1653 from nnnick/fix/1381
Tanner Linsley [Mon, 16 Nov 2015 23:07:58 +0000 (16:07 -0700)] 
Merge pull request #1653 from nnnick/fix/1381

Fixes flickering during animations

9 years agoUpdate samples 1653/head
Evert Timberg [Sun, 15 Nov 2015 16:17:02 +0000 (11:17 -0500)] 
Update samples

9 years agoCan now skip in all cases (start, mid, end) whether or not there is a look
Evert Timberg [Sun, 15 Nov 2015 16:16:41 +0000 (11:16 -0500)] 
Can now skip in all cases (start, mid, end) whether or not there is a look

9 years agoKeep this as NaN so point._view.skip is set correctly
Evert Timberg [Sun, 15 Nov 2015 16:16:17 +0000 (11:16 -0500)] 
Keep this as NaN so point._view.skip is set correctly

9 years agoFix line tests. Still need to add tests of the skip code.
Evert Timberg [Sun, 15 Nov 2015 04:16:07 +0000 (23:16 -0500)] 
Fix line tests. Still need to add tests of the skip code.

9 years agoFix an incorrect test setup
Evert Timberg [Sun, 15 Nov 2015 03:52:10 +0000 (22:52 -0500)] 
Fix an incorrect test setup

9 years agoHandle transitioning NaNs
Evert Timberg [Sun, 15 Nov 2015 03:49:53 +0000 (22:49 -0500)] 
Handle transitioning NaNs

9 years agoPrevent NaN results when previous, point, and next are all the same
Evert Timberg [Sun, 15 Nov 2015 03:49:08 +0000 (22:49 -0500)] 
Prevent NaN results when previous, point, and next are all the same

9 years agosome duplicate code cleanup
Evert Timberg [Sun, 15 Nov 2015 03:06:37 +0000 (22:06 -0500)] 
some duplicate code cleanup

9 years agoRefactor the lineToNextPoint functionality to give the correct draw line behaviour...
Evert Timberg [Sun, 15 Nov 2015 02:57:22 +0000 (21:57 -0500)] 
Refactor the lineToNextPoint functionality to give the correct draw line behaviour. Makes the code a little cleaner too.

9 years agoTypo
Evert Timberg [Sat, 14 Nov 2015 03:42:42 +0000 (22:42 -0500)] 
Typo

9 years agoCleanup
Evert Timberg [Sat, 14 Nov 2015 03:42:33 +0000 (22:42 -0500)] 
Cleanup

9 years agoSimplify code for capping bezier control points. Cap the X direction as well.
Evert Timberg [Sat, 14 Nov 2015 03:15:23 +0000 (22:15 -0500)] 
Simplify code for capping bezier control points. Cap the X direction as well.

9 years agoRefactor the line drawing code. Tests are broken.
Evert Timberg [Sat, 14 Nov 2015 03:04:38 +0000 (22:04 -0500)] 
Refactor the line drawing code. Tests are broken.

9 years agoMerge pull request #1649 from nnnick/fix/scale_fitting
Evert Timberg [Fri, 13 Nov 2015 18:57:00 +0000 (13:57 -0500)] 
Merge pull request #1649 from nnnick/fix/scale_fitting

Improve the fitting of vertical axes

9 years agoAlways include padding to ensure that we can always see the tick labels of vertical... 1649/head
Evert Timberg [Fri, 13 Nov 2015 18:24:22 +0000 (13:24 -0500)] 
Always include padding to ensure that we can always see the tick labels of vertical axes

9 years agoUse the dataset backgroundColor, borderWidth, and borderColor, if specified, for... 1647/head
Evert Timberg [Fri, 13 Nov 2015 16:21:44 +0000 (11:21 -0500)] 
Use the dataset backgroundColor, borderWidth, and borderColor, if specified, for points. Added tests for this case.

9 years agoUpdate line sample to change the entire data object 1646/head
Evert Timberg [Fri, 13 Nov 2015 15:01:38 +0000 (10:01 -0500)] 
Update line sample to change the entire data object

9 years agoReference data from the main controller wherever possible. Updated tests to account...
Evert Timberg [Fri, 13 Nov 2015 14:38:35 +0000 (09:38 -0500)] 
Reference data from the main controller wherever possible. Updated tests to account for this.

9 years agoUpdate tooltip colour draw code
Evert Timberg [Fri, 13 Nov 2015 13:20:39 +0000 (08:20 -0500)] 
Update tooltip colour draw code

9 years agoTest for skipping drawing 1645/head
Evert Timberg [Thu, 12 Nov 2015 02:49:07 +0000 (21:49 -0500)] 
Test for skipping drawing

9 years agoBail out, same as the x axis
Evert Timberg [Thu, 12 Nov 2015 02:40:29 +0000 (21:40 -0500)] 
Bail out, same as the x axis

9 years agoDo not bind to touchend events. This is the same as v1.x 1644/head
Evert Timberg [Thu, 12 Nov 2015 02:21:25 +0000 (21:21 -0500)] 
Do not bind to touchend events. This is the same as v1.x

9 years agoDoughnut, polar area, and radar samples should use the same canvas style 1642/head
etimberg [Thu, 12 Nov 2015 00:06:36 +0000 (19:06 -0500)] 
Doughnut, polar area, and radar samples should use the same canvas style

9 years agoMerge pull request #1632 from pascoual/v2.0-dev
Evert Timberg [Tue, 10 Nov 2015 00:46:41 +0000 (19:46 -0500)] 
Merge pull request #1632 from pascoual/v2.0-dev

Fix: no tooltips when missing data for one or more dataset

9 years agoFix: tooltips checks indent 1632/head
Pascoual [Tue, 10 Nov 2015 00:00:30 +0000 (01:00 +0100)] 
Fix: tooltips checks indent

9 years agoFix: no tooltips when missing data for one or more dataset
Pascoual [Mon, 9 Nov 2015 23:53:08 +0000 (00:53 +0100)] 
Fix: no tooltips when missing data for one or more dataset

9 years agoMerge pull request #1628 from nnnick/chrome-travis
Tanner Linsley [Sat, 7 Nov 2015 21:00:34 +0000 (14:00 -0700)] 
Merge pull request #1628 from nnnick/chrome-travis

Travis CI should also run tests on chrome

9 years agoFix tests 1628/head
Evert Timberg [Sat, 7 Nov 2015 14:40:41 +0000 (09:40 -0500)] 
Fix tests

9 years agoTravis CI should also run tests on chrome
Evert Timberg [Sat, 7 Nov 2015 14:34:07 +0000 (09:34 -0500)] 
Travis CI should also run tests on chrome

9 years agoMerge pull request #1627 from pascoual/v2.0-dev
Evert Timberg [Sat, 7 Nov 2015 00:56:29 +0000 (19:56 -0500)] 
Merge pull request #1627 from pascoual/v2.0-dev

Add: options.ticks.maxTicksLimit

9 years agoUpdate doc for options.ticks.maxTicksLimit 1627/head
Pascal Richier [Sat, 7 Nov 2015 00:46:14 +0000 (01:46 +0100)] 
Update doc for options.ticks.maxTicksLimit

9 years agoUpdate doc for options.ticks.maxTicksLimit
Pascal Richier [Sat, 7 Nov 2015 00:42:19 +0000 (01:42 +0100)] 
Update doc for options.ticks.maxTicksLimit

9 years agoAdd options.ticks.maxTicksLimit
Pascal Richier [Sat, 7 Nov 2015 00:39:30 +0000 (01:39 +0100)] 
Add options.ticks.maxTicksLimit

To be able to change default '11' value

9 years agoAdd options.ticks.maxTicksLimit
Pascal Richier [Sat, 7 Nov 2015 00:37:09 +0000 (01:37 +0100)] 
Add options.ticks.maxTicksLimit

To be able to change default '11' value