Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 12:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,893 Commits 8 Branches 114 Tags 67 MiB
0720608e64
Commit Graph

1893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evert Timberg
0720608e64 Merge pull request #2776 from chartjs/fix/2775 
fix tooltip with array returns
 2016-06-14 19:31:10 -04:00
Evert Timberg
f106e1bf2d fix tooltip with array returns 2016-06-14 19:19:15 -04:00
Evert Timberg
44e4004589 Merge pull request #2760 from chartjs/2.1.5_release 
Bump version to 2.1.5 and build
 2016-06-12 13:21:06 -04:00
Evert Timberg
3d03e36408 Bump version to 2.1.5 and build 2016-06-12 13:14:56 -04:00
Evert Timberg
16a6555bc2 Merge pull request #2758 from chartjs/fix/zoom-curved-lines 
Do not cap bezier control point locations
 2016-06-12 12:18:27 -04:00
Evert Timberg
f3d4ee9333 Capping these to the chart bounds causes lines to bend during pan and zoom 2016-06-12 09:19:33 -04:00
Evert Timberg
5de72a1cdf Merge pull request #2755 from chartjs/fix/2751 
Fix pointLabel docs typo
 2016-06-11 10:45:31 -04:00
Evert Timberg
7be69ce7e3 Fix pointLabel docs typo 2016-06-11 09:24:55 -04:00
Evert Timberg
647dc582cd Merge pull request #2752 from simonbrunel/plugins-arch 
Plugins Enhancement
 2016-06-11 08:42:23 -04:00
Simon Brunel
53eb7667dd New datasets update plugin extensions 
Add `beforeDatasetsUpdate` and `afterDatasetsUpdate` plugin notifications during the chart update. Plugins are able to cancel the datasets update by explicitly returning false to `beforeDatasetsUpdate`. For consistency, rename `(before|after)DatasetDraw` to `(before|after)DatasetsDraw`.
 2016-06-11 00:17:48 +02:00
Simon Brunel
dfdbd4465c Allow to register/unregister an array of plugins 
The plugins service now accepts an array of plugin instances to register or unregister (for consistency, renamed `Chart.plugins.remove` to `unregister`). Also added a few methods to manipulate registered plugins, such as `count`, `getAll` and `clear` (mainly used by our unit tests).
 2016-06-11 00:17:44 +02:00
Simon Brunel
a55c17d73f Enhance plugin notification system 
Change the plugin notification behavior: this method now returns false as soon as a plugin *explicitly* returns false, else returns true. Also, plugins are now called in their own scope (so remove the never used `scope` parameter).
 2016-06-10 22:26:55 +02:00
Simon Brunel
7a419af4c2 Rename plugin service and notification method 
Rename `Chart.pluginService` to `Chart.plugins` (so move the old Chart.plugins array as a private member of the service), and rename `notifyPlugins` to `notify` for consistency with other service methods.
 2016-06-10 22:26:35 +02:00
Zach Panzarino
d901687c2d Remove link that doesn't exist anymore in scale docs 2016-06-10 15:00:17 +00:00
Evert Timberg
e7834442ac Merge pull request #2739 from msimulcik/master 
Fix of radial linear scale font family settings bug
 2016-06-09 18:36:26 -04:00
Evert Timberg
b1c50ed0c2 Merge pull request #2732 from chartjs/scale-colors-per-line 
Scale colors per line
 2016-06-09 18:35:48 -04:00
Evert Timberg
3aeddf5239 Merge pull request #2723 from chartjs/vertical-legend 
Vertical legend
 2016-06-09 18:35:29 -04:00
Miroslav Simulcik
2e29f4981d Revert "Fixed radial linear scale font family settings bug" 
This reverts commit 6e3c6c05ad.
 2016-06-09 09:37:57 +02:00
Evert Timberg
8d94e3e427 Merge pull request #2712 from simonbrunel/helpers-cleanup 
Rewrite a few helpers to be more efficient
 2016-06-08 20:08:44 -04:00
Evert Timberg
958f8ca9bb Merge pull request #2730 from duerahan/master 
Tooltip options fontColor fixed
 2016-06-08 11:15:12 -04:00
Jack Valentine
29bc3b0b8b ChartJS tooltip fontColor fix 
fixed global variable name fix
callback variable name fix
- 'titleColor' to 'titleFontColor'
- 'bodyColor' to 'bodyFontColor'
- 'footerColor' to 'footerFontColor'
 2016-06-09 00:04:20 +09:00
Jack Valentine
99d3f423cb titleColor options is not available 
titleColor change to titleFontColor
 2016-06-08 23:15:21 +09:00
Jack Valentine
d6e5b5e79a core tooltip test case fixe 
titleColor options is not available
titleColor change to titleFontColor
 2016-06-08 23:01:41 +09:00
Miroslav Simulcik
6e3c6c05ad Fixed radial linear scale font family settings bug 2016-06-08 15:21:54 +02:00
Evert Timberg
fbecfa2baf Reduce duplicated code in core scale draw method 2016-06-07 22:03:36 -04:00
문승찬
5687aa479f Fix tooltip core test case 
Change tooltip font color options
this options changed in tooltip core
bodyColor  -> bodyFontColor
titleColor -> titleFontColor
footerColor -> footerFontColor
 2016-06-08 10:22:47 +09:00
문승찬
7ebf85eacf change tooltip font color option 
bodyColor  -> bodyFontColor
titleColor -> titleFontColor
footerColor -> footerFontColor
 2016-06-08 10:16:38 +09:00
Evert Timberg
6b2cfd5e11 Support arrays of colors and line widths in cartesian axes 2016-06-07 20:22:06 -04:00
Evert Timberg
a687749ed4 Radial linear scale array properties for line width and color 2016-06-07 20:09:33 -04:00
Evert Timberg
5f7865c741 Merge pull request #2724 from rawliving-germany/master 
fix typo in tooltip conf doc.
 2016-06-07 08:53:34 -04:00
Ryan M. Poe
77357e57d6 Refactor spanGaps for line graphs with sparse data (#2721) 
Fix #2435, this very slim patch (including its relevant documentation addition) adds a small option to line chart datasets (spanGaps) that allows users trying to graph sparse datasets to have lines between null entries drawn, rather than omitted.
 2016-06-07 09:15:26 +02:00
Felix Wolfsteller
f71f525caf fix typo in tooltip conf doc. 2016-06-07 07:46:13 +02:00
Evert Timberg
71cbc4c5c1 Optimize legend drawing 2016-06-06 22:14:42 -04:00
Evert Timberg
80bd7d3f60 Initial vertical legend mode 2016-06-06 21:41:40 -04:00
Evert Timberg
959b4eedf6 Merge pull request #2716 from thebenedict/master 
Make canvas element display: block by default, with config option to …
 2016-06-06 10:14:59 -04:00
thebenedict
0b19689b00 style canvas element display: block by default 2016-06-06 17:05:44 +03:00
Simon Brunel
287cefc9b9 Rewrite a few helpers to be more efficient 
Resolve at definition time if a browser built-in method or our polyfill should be used, so avoid checking it for each call. Also, `helpers.extend` doesn't need to iterate two times on the function arguments. Finally, remove helpers never referenced.
 2016-06-05 23:23:19 +02:00
Evert Timberg
be4ef73ecd Merge pull request #2711 from simonbrunel/bundle-collapser 
Use bundle-collapser to reduce build size
 2016-06-05 08:56:05 -04:00
Simon Brunel
5c56f5cd9d Use bundle-collapser to reduce build size 
This browserify plugin converts required string paths to int (see https://github.com/substack/bundle-collapser), lowering our *.min.js by ~1.8KB.
 2016-06-05 09:56:41 +02:00
Evert Timberg
ec109effe1 Merge pull request #2706 from sassomedia/master_updateBuildAMD 
Amend build task with flag for AMD compatible builds (#2298)
 2016-06-04 20:49:49 -04:00
Evert Timberg
7d3dc12372 Merge branch 'Tarqwyn-multiline_labels' 2016-06-04 20:49:19 -04:00
Evert Timberg
76d284c4ae Merge branch 'multiline_labels' of https://github.com/Tarqwyn/Chart.js into Tarqwyn-multiline_labels 
Conflicts:
	src/core/core.scale.js
 2016-06-04 20:48:26 -04:00
Evert Timberg
d9c335c860 Merge pull request #2695 from zachpanz88/this-rename 
Rename `this` keyword
 2016-06-04 18:25:14 -04:00
zachpanz88
148c66fe95 Update this -> me with master 2016-06-04 14:16:35 -04:00
zachpanz88
5fae4dd305 Change this -> me in source files 
This change allows for smaller minified code in the final version, resulting in a smaller file size. Some files had previously used _this, but that has been changed to me to keep consistency throughout the project.
 2016-06-04 14:14:16 -04:00
Evert Timberg
76a64930a3 Merge pull request #2696 from NoelOConnell/master 
Fix for chart title not updating
 2016-06-04 10:51:29 -04:00
Evert Timberg
ca07f72f6b Merge pull request #2698 from dennybiasiolli/fix_label_fillstyle 
legend: fix rendering in browsers other than Chrome
 2016-06-04 10:47:15 -04:00
Eric D. Lewis
204021007f Amend build task with flag for AMD compatible builds (#2298) 2016-06-03 20:21:49 -04:00
Evert Timberg
964009b3b3 Merge pull request #2694 from chartjs/fix/2689 
Add a way to know when a resize occurs.
 2016-06-03 18:27:26 -04:00
Tarqwyn
e856dda04f Suggested changes from PR review 
Changes to be committed:
	modified:   docs/02-Scales.md
	modified:   src/core/core.helpers.js
	modified:   src/core/core.scale.js
	modified:   test/core.helpers.tests.js
 2016-06-03 20:15:29 +01:00