Commit Graph

2046 Commits

Author SHA1 Message Date
Evert Timberg
ae01f1726c Fix tests 2016-05-26 19:22:11 -04:00
Evert Timberg
40d76b6a7b 2.1.4 release 2016-05-26 18:43:39 -04:00
Evert Timberg
1801f56d8f Merge pull request #2645 from Rowno/patch-1
docs: fix the bar chart default axis id's
2016-05-26 17:51:27 -04:00
Roland Warmerdam
127ed8ddb3 docs: fix the bar chart default axis id's 2016-05-26 14:38:53 -07:00
Evert Timberg
46fc96bf4d Remove unused code from core controller. 2016-05-25 21:30:22 -04:00
Evert Timberg
d6289c6129 Convert title block to a plugin 2016-05-25 21:28:02 -04:00
Evert Timberg
1ae0f5e4d4 Legend is attached to the graph as a plugin. 2016-05-25 21:23:46 -04:00
Evert Timberg
8876cd8887 Merge pull request #2625 from chartjs/fix/2344
Start on Documentation Update
2016-05-25 18:50:32 -04:00
Evert Timberg
93e5e52c65 Merge branch 'master' into fix/2344 2016-05-25 18:43:35 -04:00
Evert Timberg
81aedf4df0 Fix scale typos 2016-05-25 18:39:43 -04:00
Simon Brunel
451a9a4515 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.
2016-05-25 18:39:42 -04:00
Vanderhoven Nick
07b7db14e9 This fixes documentation issue #2628 2016-05-25 18:39:42 -04:00
Simon Brunel
1fc71a4a89 Decomplexify Chart.core.controller.eventHandler
Refactor redundant code, use local variables and introduce a new helper to compare arrays (Chart.helpers.arrayEquals).
2016-05-25 18:39:42 -04:00
Simon Brunel
07595d3271 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.
2016-05-25 18:39:42 -04:00
Simon Brunel
381aeaa19f 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.).
2016-05-25 18:39:42 -04:00
Simon Brunel
d513ba0ef7 Refactor scale base pixel and point calculation. 2016-05-25 18:39:42 -04:00
Zach Panzarino
e78d06d3e8 Clean up gulpfile even more 2016-05-25 18:39:42 -04:00
Zach Panzarino
1fe78ebc74 Clean up gulpfile 2016-05-25 18:39:42 -04:00
Evert Timberg
f2cb762141 Helpers improvements 2016-05-25 18:39:42 -04:00
Hagen Schulze
1f653f3f6e This fixes #2589 2016-05-25 18:39:41 -04:00
Evert Timberg
e81299ded4 Improve line chart docs 2016-05-25 18:39:41 -04:00
Evert Timberg
4a25106239 Scale docs 2016-05-25 18:39:41 -04:00
Evert Timberg
9962017271 Improve configuration options 2016-05-25 18:39:41 -04:00
Evert Timberg
4ab1b0c415 Merge pull request #2637 from simonbrunel/fix/2418
Fix #2418 Firefox old version compatibility
2016-05-25 17:44:38 -04:00
Simon Brunel
08de9faf10 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.
2016-05-25 22:51:41 +02:00
Evert Timberg
6a70f96d12 Merge pull request #2629 from nvdh/master
Fix for documentation issue #2628
2016-05-25 09:03:14 -04:00
Vanderhoven Nick
02f34f4e92 This fixes documentation issue #2628 2016-05-25 11:03:50 +02:00
Evert Timberg
e3943174cc Merge pull request #2612 from simonbrunel/refactor
Refactor and clean up
2016-05-24 21:30:10 -04:00
Zach Panzarino
050a6cb7c0 Clean up gulpfile even more 2016-05-24 15:04:20 +00:00
Evert Timberg
62bb397d22 Merge pull request #2620 from zachpanz88/code-climate
Clean up gulpfile
2016-05-24 09:24:05 -04:00
Zach Panzarino
cd7b975c95 Clean up gulpfile 2016-05-24 13:02:02 +00:00
Simon Brunel
7f71990a40 Decomplexify Chart.core.controller.eventHandler
Refactor redundant code, use local variables and introduce a new helper to compare arrays (Chart.helpers.arrayEquals).
2016-05-22 00:58:02 +02:00
Simon Brunel
d584afb543 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.
2016-05-22 00:25:53 +02:00
Simon Brunel
7108f78d2f 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.).
2016-05-22 00:25:51 +02:00
Simon Brunel
a566d16e69 Refactor scale base pixel and point calculation. 2016-05-20 20:17:28 +02:00
Simon Brunel
8c5d8855c6 Merge pull request #2551 from chartjs/helper-perf-and-minification
Helpers improvements
2016-05-19 19:51:06 +02:00
Evert Timberg
ecb7ce133e Merge pull request #2590 from haschu/fix/2589
This fixes #2589
2016-05-19 07:02:58 -04:00
Evert Timberg
62b9a4b616 Fix section capitalization 2016-05-18 22:44:33 -04:00
Evert Timberg
b76bda0378 Merge pull request #2597 from chartjs/fix/2593
Update initial sample with colours
2016-05-18 22:15:19 -04:00
Evert Timberg
dfcf874735 Update initial sample with colours 2016-05-18 22:10:20 -04:00
Evert Timberg
73610c00b4 Merge pull request #2596 from chartjs/fix/2406
Give the doughnut sample the correct color label
2016-05-18 21:46:42 -04:00
Evert Timberg
edaf401d52 Merge pull request #2595 from chartjs/fix/2288
Add a note about selecting the correct build
2016-05-18 21:46:21 -04:00
Evert Timberg
ff8eb5a65b Give the doughnut sample the correct color label 2016-05-18 21:43:01 -04:00
Evert Timberg
4a2c521115 Add a note about selecting the correct build that describes what the bundled versions do. 2016-05-18 21:31:51 -04:00
Evert Timberg
230691870e Merge pull request #2594 from chartjs/fix/2361
Bubble Chart documentation
2016-05-18 21:17:35 -04:00
Evert Timberg
8445057432 Bubble chart docs 2016-05-18 21:05:20 -04:00
Evert Timberg
bc2ffb2321 Add new file for bubble chart docs 2016-05-18 19:15:11 -04:00
haschu
393db2a609 This fixes #2584 (#2592)
Improve scale auto-skipper when labels are not rotated
2016-05-18 18:20:06 -04:00
Evert Timberg
f24dddeda7 Merge pull request #2567 from adileo/master
Fixed tooltip not showing in NULL datapoint in multi line chart
2016-05-18 17:51:49 -04:00
Evert Timberg
d23b2395ff Merge pull request #2578 from simonbrunel/optimizations
Point element and line controller optimizations
2016-05-18 17:51:37 -04:00