]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoMerge branch 'tooltip-improvements-and-tests' of https://github.com/nnnick/Chart... 2661/head
Evert Timberg [Sun, 29 May 2016 01:17:30 +0000 (21:17 -0400)] 
Merge branch 'tooltip-improvements-and-tests' of https://github.com/nnnick/Chart.js into tooltip-improvements-and-tests

Conflicts:
test/core.tooltip.tests.js

9 years agoImprove testing on the CI
Evert Timberg [Sun, 29 May 2016 00:55:20 +0000 (20:55 -0400)] 
Improve testing on the CI

9 years agoFix CI & JShint issues
Evert Timberg [Sun, 29 May 2016 01:01:10 +0000 (21:01 -0400)] 
Fix CI & JShint issues

9 years agoImprove testing on CI
Evert Timberg [Sun, 29 May 2016 00:55:20 +0000 (20:55 -0400)] 
Improve testing on CI

9 years agoAdd a way of sorting tooltip items with a custom sort function
Evert Timberg [Sun, 29 May 2016 00:47:36 +0000 (20:47 -0400)] 
Add a way of sorting tooltip items with a custom sort function

9 years agoImprove tooltip minification
Evert Timberg [Sat, 28 May 2016 23:39:15 +0000 (19:39 -0400)] 
Improve tooltip minification

9 years agoInitial tooltip tests + fix a bug when the tooltip beforeLabel and afterLabel callbac...
Evert Timberg [Sat, 28 May 2016 19:26:46 +0000 (15:26 -0400)] 
Initial tooltip tests + fix a bug when the tooltip beforeLabel and afterLabel callbacks returned strings

9 years agoMerge pull request #2657 from chartjs/tooltip-color-callback
Evert Timberg [Sat, 28 May 2016 16:14:27 +0000 (12:14 -0400)] 
Merge pull request #2657 from chartjs/tooltip-color-callback

Provide a way to configure the colour of tooltip items

9 years agoMerge pull request #2660 from chartjs/fix/2613
Evert Timberg [Sat, 28 May 2016 15:26:09 +0000 (11:26 -0400)] 
Merge pull request #2660 from chartjs/fix/2613

When destroying the chart, any animations should be stopped.

9 years agoWhen destroying the chart, any animations should be stopped. 2660/head
Evert Timberg [Sat, 28 May 2016 15:05:02 +0000 (11:05 -0400)] 
When destroying the chart, any animations should be stopped.

9 years agoMerge pull request #2658 from chartjs/fix/2580
Evert Timberg [Sat, 28 May 2016 14:56:25 +0000 (10:56 -0400)] 
Merge pull request #2658 from chartjs/fix/2580

Allow turning off lines on a per dataset basis

9 years agoMerge pull request #2659 from chartjs/fix/2639
Evert Timberg [Sat, 28 May 2016 14:52:42 +0000 (10:52 -0400)] 
Merge pull request #2659 from chartjs/fix/2639

Fix pie custom tooltip sample

9 years agoFix pie custom tooltip sample 2659/head
Evert Timberg [Sat, 28 May 2016 14:48:33 +0000 (10:48 -0400)] 
Fix pie custom tooltip sample

9 years agoAllow turning off lines on a per dataset basis 2658/head
Evert Timberg [Sat, 28 May 2016 02:20:51 +0000 (22:20 -0400)] 
Allow turning off lines on a per dataset basis

9 years agoMerge pull request #2640 from chartjs/legend-and-title-as-plugins
Evert Timberg [Sat, 28 May 2016 01:19:28 +0000 (21:19 -0400)] 
Merge pull request #2640 from chartjs/legend-and-title-as-plugins

Legend and title as plugins

9 years agoTooltip now has a callback for configuring the colors of items displayed. Added docs... 2657/head
Evert Timberg [Sat, 28 May 2016 01:07:02 +0000 (21:07 -0400)] 
Tooltip now has a callback for configuring the colors of items displayed. Added docs and improved the options passed to the tooltip

9 years agoMerge pull request #2649 from chartjs/fix/2647
Evert Timberg [Fri, 27 May 2016 00:23:10 +0000 (20:23 -0400)] 
Merge pull request #2649 from chartjs/fix/2647

Line points always need to pivot

9 years agoLine points need always need to pivot after regardless of whether or not bezier point... 2649/head
Evert Timberg [Fri, 27 May 2016 00:02:46 +0000 (20:02 -0400)] 
Line points need always need to pivot after regardless of whether or not bezier points are updated. Bezier points should only be updated if the line tension is not 0.

9 years agoMerge pull request #2648 from chartjs/fix/2607
Evert Timberg [Thu, 26 May 2016 23:42:37 +0000 (19:42 -0400)] 
Merge pull request #2648 from chartjs/fix/2607

Don't use translates and rotates for drawing rotated rectangles

9 years agoDon't use translates and rotates for drawing rotated rectangles 2648/head
Evert Timberg [Thu, 26 May 2016 23:38:27 +0000 (19:38 -0400)] 
Don't use translates and rotates for drawing rotated rectangles

9 years agoFix tests 2640/head
Evert Timberg [Thu, 26 May 2016 23:22:11 +0000 (19:22 -0400)] 
Fix tests

9 years ago2.1.4 release v2.1.4
Evert Timberg [Thu, 26 May 2016 22:43:39 +0000 (18:43 -0400)] 
2.1.4 release

9 years agoMerge pull request #2645 from Rowno/patch-1
Evert Timberg [Thu, 26 May 2016 21:51:27 +0000 (17:51 -0400)] 
Merge pull request #2645 from Rowno/patch-1

docs: fix the bar chart default axis id's

9 years agodocs: fix the bar chart default axis id's 2645/head
Roland Warmerdam [Thu, 26 May 2016 21:38:53 +0000 (14:38 -0700)] 
docs: fix the bar chart default axis id's

9 years agoRemove unused code from core controller.
Evert Timberg [Thu, 26 May 2016 01:30:22 +0000 (21:30 -0400)] 
Remove unused code from core controller.

9 years agoConvert title block to a plugin
Evert Timberg [Thu, 26 May 2016 01:28:02 +0000 (21:28 -0400)] 
Convert title block to a plugin

9 years agoLegend is attached to the graph as a plugin.
Evert Timberg [Thu, 26 May 2016 01:23:46 +0000 (21:23 -0400)] 
Legend is attached to the graph as a plugin.

9 years agoMerge pull request #2625 from chartjs/fix/2344
Evert Timberg [Wed, 25 May 2016 22:50:32 +0000 (18:50 -0400)] 
Merge pull request #2625 from chartjs/fix/2344

Start on Documentation Update

9 years agoMerge branch 'master' into fix/2344 2625/head
Evert Timberg [Wed, 25 May 2016 22:43:35 +0000 (18:43 -0400)] 
Merge branch 'master' into fix/2344

9 years agoFix scale typos
Evert Timberg [Wed, 25 May 2016 22:37:07 +0000 (18:37 -0400)] 
Fix scale typos

9 years agoFix #2418 Firefox old version compatibility
Simon Brunel [Tue, 24 May 2016 22:04:59 +0000 (00:04 +0200)] 
Fix #2418 Firefox old version compatibility

Old versions of FF doesn't accept accessing the computed style via the 'max-width' and 'max-height' CSS notations using brackets, in which case the returned value is undefined. Changed the constraint methods to use maxWidth and mawHeight instead and make sure to test valid values.

9 years agoThis fixes documentation issue #2628
Vanderhoven Nick [Wed, 25 May 2016 09:03:50 +0000 (11:03 +0200)] 
This fixes documentation issue #2628

9 years agoDecomplexify Chart.core.controller.eventHandler
Simon Brunel [Sat, 21 May 2016 22:21:59 +0000 (00:21 +0200)] 
Decomplexify Chart.core.controller.eventHandler

Refactor redundant code, use local variables and introduce a new helper to compare arrays (Chart.helpers.arrayEquals).

9 years agoRefactor controller scale methods
Simon Brunel [Sat, 21 May 2016 20:53:58 +0000 (22:53 +0200)] 
Refactor controller scale methods

Rewrite these two methods to reduce code duplication. Note that options.scale is not anymore mapped to 'radialScale' ID but to 'scale' ID (see ensureScalesHaveIDs), since this ID is not referenced anywhere in the code base.

9 years agoRefactor addElements and addElementAndReset
Simon Brunel [Fri, 20 May 2016 21:42:24 +0000 (23:42 +0200)] 
Refactor addElements and addElementAndReset

Data controllers should now rarely implement addElements and addElementAndReset but instead should define dataElementType (and optionally datasetElementType). Also remove some dead code (e.g. numBars, colorForNewElement, etc.).

9 years agoRefactor scale base pixel and point calculation.
Simon Brunel [Fri, 20 May 2016 18:17:28 +0000 (20:17 +0200)] 
Refactor scale base pixel and point calculation.

9 years agoClean up gulpfile even more
Zach Panzarino [Tue, 24 May 2016 15:04:20 +0000 (15:04 +0000)] 
Clean up gulpfile even more

9 years agoClean up gulpfile
Zach Panzarino [Tue, 24 May 2016 13:02:02 +0000 (13:02 +0000)] 
Clean up gulpfile

9 years agoHelpers improvements
Evert Timberg [Sat, 14 May 2016 19:59:40 +0000 (15:59 -0400)] 
Helpers improvements

9 years agoThis fixes #2589
Hagen Schulze [Wed, 18 May 2016 18:42:54 +0000 (20:42 +0200)] 
This fixes #2589

9 years agoImprove line chart docs
Evert Timberg [Wed, 25 May 2016 22:27:57 +0000 (18:27 -0400)] 
Improve line chart docs

9 years agoScale docs
Evert Timberg [Sat, 21 May 2016 01:03:59 +0000 (21:03 -0400)] 
Scale docs

9 years agoImprove configuration options
Evert Timberg [Thu, 19 May 2016 02:49:20 +0000 (22:49 -0400)] 
Improve configuration options

9 years agoMerge pull request #2637 from simonbrunel/fix/2418
Evert Timberg [Wed, 25 May 2016 21:44:38 +0000 (17:44 -0400)] 
Merge pull request #2637 from simonbrunel/fix/2418

Fix #2418 Firefox old version compatibility

9 years agoFix #2418 Firefox old version compatibility 2637/head
Simon Brunel [Tue, 24 May 2016 22:04:59 +0000 (00:04 +0200)] 
Fix #2418 Firefox old version compatibility

Old versions of FF doesn't accept accessing the computed style via the 'max-width' and 'max-height' CSS notations using brackets, in which case the returned value is undefined. Changed the constraint methods to use maxWidth and mawHeight instead and make sure to test valid values.

9 years agoMerge pull request #2629 from nvdh/master
Evert Timberg [Wed, 25 May 2016 13:03:14 +0000 (09:03 -0400)] 
Merge pull request #2629 from nvdh/master

Fix for documentation issue #2628

9 years agoThis fixes documentation issue #2628 2629/head
Vanderhoven Nick [Wed, 25 May 2016 09:03:50 +0000 (11:03 +0200)] 
This fixes documentation issue #2628

9 years agoMerge pull request #2612 from simonbrunel/refactor
Evert Timberg [Wed, 25 May 2016 01:30:10 +0000 (21:30 -0400)] 
Merge pull request #2612 from simonbrunel/refactor

Refactor and clean up

9 years agoClean up gulpfile even more
Zach Panzarino [Tue, 24 May 2016 15:04:20 +0000 (15:04 +0000)] 
Clean up gulpfile even more

9 years agoMerge pull request #2620 from zachpanz88/code-climate
Evert Timberg [Tue, 24 May 2016 13:24:05 +0000 (09:24 -0400)] 
Merge pull request #2620 from zachpanz88/code-climate

Clean up gulpfile

9 years agoClean up gulpfile 2620/head
Zach Panzarino [Tue, 24 May 2016 13:02:02 +0000 (13:02 +0000)] 
Clean up gulpfile

9 years agoDecomplexify Chart.core.controller.eventHandler 2612/head
Simon Brunel [Sat, 21 May 2016 22:21:59 +0000 (00:21 +0200)] 
Decomplexify Chart.core.controller.eventHandler

Refactor redundant code, use local variables and introduce a new helper to compare arrays (Chart.helpers.arrayEquals).

9 years agoRefactor controller scale methods
Simon Brunel [Sat, 21 May 2016 20:53:58 +0000 (22:53 +0200)] 
Refactor controller scale methods

Rewrite these two methods to reduce code duplication. Note that options.scale is not anymore mapped to 'radialScale' ID but to 'scale' ID (see ensureScalesHaveIDs), since this ID is not referenced anywhere in the code base.

9 years agoRefactor addElements and addElementAndReset
Simon Brunel [Fri, 20 May 2016 21:42:24 +0000 (23:42 +0200)] 
Refactor addElements and addElementAndReset

Data controllers should now rarely implement addElements and addElementAndReset but instead should define dataElementType (and optionally datasetElementType). Also remove some dead code (e.g. numBars, colorForNewElement, etc.).

9 years agoRefactor scale base pixel and point calculation.
Simon Brunel [Fri, 20 May 2016 18:17:28 +0000 (20:17 +0200)] 
Refactor scale base pixel and point calculation.

9 years agoMerge pull request #2551 from chartjs/helper-perf-and-minification
Simon Brunel [Thu, 19 May 2016 17:51:06 +0000 (19:51 +0200)] 
Merge pull request #2551 from chartjs/helper-perf-and-minification

Helpers improvements

9 years agoMerge pull request #2590 from haschu/fix/2589
Evert Timberg [Thu, 19 May 2016 11:02:58 +0000 (07:02 -0400)] 
Merge pull request #2590 from haschu/fix/2589

This fixes #2589

9 years agoFix section capitalization
Evert Timberg [Thu, 19 May 2016 02:44:33 +0000 (22:44 -0400)] 
Fix section capitalization

9 years agoMerge pull request #2597 from chartjs/fix/2593
Evert Timberg [Thu, 19 May 2016 02:15:19 +0000 (22:15 -0400)] 
Merge pull request #2597 from chartjs/fix/2593

Update initial sample with colours

9 years agoUpdate initial sample with colours 2597/head
Evert Timberg [Thu, 19 May 2016 02:10:20 +0000 (22:10 -0400)] 
Update initial sample with colours

9 years agoMerge pull request #2596 from chartjs/fix/2406
Evert Timberg [Thu, 19 May 2016 01:46:42 +0000 (21:46 -0400)] 
Merge pull request #2596 from chartjs/fix/2406

Give the doughnut sample the correct color label

9 years agoMerge pull request #2595 from chartjs/fix/2288
Evert Timberg [Thu, 19 May 2016 01:46:21 +0000 (21:46 -0400)] 
Merge pull request #2595 from chartjs/fix/2288

Add a note about selecting the correct build

9 years agoGive the doughnut sample the correct color label 2596/head
Evert Timberg [Thu, 19 May 2016 01:43:01 +0000 (21:43 -0400)] 
Give the doughnut sample the correct color label

9 years agoAdd a note about selecting the correct build that describes what the bundled versions do. 2595/head
Evert Timberg [Thu, 19 May 2016 01:31:51 +0000 (21:31 -0400)] 
Add a note about selecting the correct build that describes what the bundled versions do.

9 years agoMerge pull request #2594 from chartjs/fix/2361
Evert Timberg [Thu, 19 May 2016 01:17:35 +0000 (21:17 -0400)] 
Merge pull request #2594 from chartjs/fix/2361

Bubble Chart documentation

9 years agoBubble chart docs 2594/head
Evert Timberg [Thu, 19 May 2016 01:05:20 +0000 (21:05 -0400)] 
Bubble chart docs

9 years agoAdd new file for bubble chart docs
Evert Timberg [Wed, 18 May 2016 23:15:11 +0000 (19:15 -0400)] 
Add new file for bubble chart docs

9 years agoThis fixes #2584 (#2592)
haschu [Wed, 18 May 2016 22:20:06 +0000 (00:20 +0200)] 
This fixes #2584 (#2592)

Improve scale auto-skipper when labels are not rotated

9 years agoMerge pull request #2567 from adileo/master
Evert Timberg [Wed, 18 May 2016 21:51:49 +0000 (17:51 -0400)] 
Merge pull request #2567 from adileo/master

Fixed tooltip not showing in NULL datapoint in multi line chart

9 years agoMerge pull request #2578 from simonbrunel/optimizations
Evert Timberg [Wed, 18 May 2016 21:51:37 +0000 (17:51 -0400)] 
Merge pull request #2578 from simonbrunel/optimizations

Point element and line controller optimizations

9 years agoThis fixes #2589 2590/head
Hagen Schulze [Wed, 18 May 2016 18:42:54 +0000 (20:42 +0200)] 
This fixes #2589

9 years agoMerge pull request #2588 from AllenJB/patch-1
Evert Timberg [Wed, 18 May 2016 17:59:33 +0000 (13:59 -0400)] 
Merge pull request #2588 from AllenJB/patch-1

Fix handling of moments by scale.getRightValue

9 years agoFix handling of moments by scale.getRightValue 2588/head
AllenJB [Wed, 18 May 2016 16:38:20 +0000 (17:38 +0100)] 
Fix handling of moments by scale.getRightValue

When using {x: moment, y: value} datapoints

9 years agoAdd BrowserStack mention to readme and website
Zach Panzarino [Wed, 18 May 2016 12:32:09 +0000 (12:32 +0000)] 
Add BrowserStack mention to readme and website

9 years agoOptimize element.point and controller.line 2578/head
Simon Brunel [Tue, 17 May 2016 11:32:40 +0000 (13:32 +0200)] 
Optimize element.point and controller.line

Change some helpers.each() to `for` loops when iterating on a potentially large number of items and use more local variables when appropriate (making the minified build a bit smaller).

9 years agoMerge pull request #2569 from chartjs/fix/2216
Evert Timberg [Tue, 17 May 2016 22:04:23 +0000 (18:04 -0400)] 
Merge pull request #2569 from chartjs/fix/2216

Improve bar sizing

9 years agoFix #2574 - Add support to hide border on the chart
Ceane Lamerez [Tue, 17 May 2016 19:11:29 +0000 (21:11 +0200)] 
Fix #2574 - Add support to hide border on the chart

9 years agoRemove useless hasOwnProperty checks
Simon Brunel [Mon, 16 May 2016 21:31:47 +0000 (23:31 +0200)] 
Remove useless hasOwnProperty checks

The Chart.helpers.each method uses Object.keys() to iterates on the object *own enumerable properties*, meaning that checking if object.hasOwnProperty() is useless.

9 years agoFix syntax error in docs (#2572)
Zach Panzarino [Tue, 17 May 2016 12:47:27 +0000 (08:47 -0400)] 
Fix syntax error in docs (#2572)

9 years agoHorizontal bars are similar 2569/head
Evert Timberg [Tue, 17 May 2016 02:17:45 +0000 (22:17 -0400)] 
Horizontal bars are similar

9 years agoImprove tick width for vertical bars
Evert Timberg [Tue, 17 May 2016 02:14:33 +0000 (22:14 -0400)] 
Improve tick width for vertical bars

9 years agoMerge pull request #2568 from niemyjski/patch-1
Evert Timberg [Mon, 16 May 2016 23:19:56 +0000 (19:19 -0400)] 
Merge pull request #2568 from niemyjski/patch-1

Fixed a syntax error in the sample

9 years agoFixed a syntax error in the sample 2568/head
Blake Niemyjski [Mon, 16 May 2016 23:14:14 +0000 (18:14 -0500)] 
Fixed a syntax error in the sample

9 years agoFixed tooltip not showing in NULL datapoint in multi line chart 2567/head
Adileo Barone [Mon, 16 May 2016 19:02:57 +0000 (21:02 +0200)] 
Fixed tooltip not showing in NULL datapoint in multi line chart

9 years agoRevert "Travis GitHub Releases" (#2553)
Evert Timberg [Sat, 14 May 2016 22:08:38 +0000 (18:08 -0400)] 
Revert "Travis GitHub Releases" (#2553)

9 years agoTravis GitHub Releases (#2552)
Simon Brunel [Sat, 14 May 2016 21:35:32 +0000 (23:35 +0200)] 
Travis GitHub Releases (#2552)

* Make Travis to deploy built files for tags

See https://docs.travis-ci.com/user/deployment/releases

* Remove and ignore dist/* files

Travis now builds and deploys these files for all tags, so we don't need to have them on the repository anymore.

* Add download links to the latest version

Remove outdated *standard build* and *bundled with Moment.js* links from the documentation and add a link to the latest GitHub release, from where the user can download `*.js` files.

9 years agoHelpers improvements 2551/head
Evert Timberg [Sat, 14 May 2016 19:59:40 +0000 (15:59 -0400)] 
Helpers improvements

9 years agoBump chartjs-color to version 2.0.0 (#2549)
Simon Brunel [Sat, 14 May 2016 17:35:35 +0000 (19:35 +0200)] 
Bump chartjs-color to version 2.0.0 (#2549)

Fix color animation because the color lib changed the `mix` implementation to match SASS behavior, so the weight specifies the amount of the first color that should be included in the returned color.

9 years agoMerge pull request #2545 from niemyjski/master
Evert Timberg [Sat, 14 May 2016 15:04:54 +0000 (11:04 -0400)] 
Merge pull request #2545 from niemyjski/master

Performance and minification improvements

9 years agoMore perf and minification changes based on feedback 2545/head
Blake Niemyjski [Sat, 14 May 2016 13:58:42 +0000 (08:58 -0500)] 
More perf and minification changes based on feedback

9 years agoFixed unit tests :D
Blake Niemyjski [Sat, 14 May 2016 03:39:11 +0000 (22:39 -0500)] 
Fixed unit tests :D

9 years agoThere were conflicting tick variables
Blake Niemyjski [Sat, 14 May 2016 03:23:34 +0000 (22:23 -0500)] 
There were conflicting tick variables

9 years agoUpdated magnification and possible bug fix in removeHoverStyle
Blake Niemyjski [Sat, 14 May 2016 03:16:28 +0000 (22:16 -0500)] 
Updated magnification and possible bug fix in removeHoverStyle

9 years agoPerformance and minification improvements
Blake Niemyjski [Sat, 14 May 2016 03:07:39 +0000 (22:07 -0500)] 
Performance and minification improvements

9 years agoMerge pull request #2544 from niemyjski/patch-1
Evert Timberg [Sat, 14 May 2016 02:05:24 +0000 (22:05 -0400)] 
Merge pull request #2544 from niemyjski/patch-1

removed extra momentjs script tag

9 years agoremoved extra momentjs script tag 2544/head
Blake Niemyjski [Sat, 14 May 2016 02:04:40 +0000 (21:04 -0500)] 
removed extra momentjs script tag

9 years agoMerge pull request #2543 from chartjs/fix/2519
Evert Timberg [Fri, 13 May 2016 23:54:57 +0000 (19:54 -0400)] 
Merge pull request #2543 from chartjs/fix/2519

Error when first data point on time scale had null data

9 years agoError when first data point on time scale had null data 2543/head
Evert Timberg [Fri, 13 May 2016 23:50:59 +0000 (19:50 -0400)] 
Error when first data point on time scale had null data

9 years agoMerge pull request #2542 from chartjs/fix/2536
Evert Timberg [Fri, 13 May 2016 23:49:07 +0000 (19:49 -0400)] 
Merge pull request #2542 from chartjs/fix/2536

Provide different default tooltip functions for horizontal bar

9 years agoProvide different default tooltip functions for horizontal bar 2542/head
Evert Timberg [Fri, 13 May 2016 23:36:32 +0000 (19:36 -0400)] 
Provide different default tooltip functions for horizontal bar