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,976 Commits 8 Branches 114 Tags 67 MiB
5804f1e3c9
Commit Graph

1976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Valuntine
7d63bf085a time type xAxis height crah in line chart 
if input only one data in dataset and xAxis type is date make offset crash.
check offset value and don't devide 0 value.
Add xAxis check test case.
 2016-06-09 13:34:15 +09: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
Tarqwyn
2bc8e3c7f6 This PR allows for multi-line labels, as per Slack discussion.. 
Usage: If a label is an `array` as opposed to a `string` i.e. `[["June","2015"], "July"]` then each element is treated as a seperate line. The appropriate calculations are made to determine the correct height and width, and rotation is still supported.

view samples/line-multiline-labels.html to see it working.

On branch multiline_labels
Changes to be committed:
	modified:   docs/03-Line-Chart.md
	new file:   samples/line-multiline-labels.html
	modified:   src/core/core.helpers.js
	modified:   src/core/core.scale.js
 2016-06-03 17:12:19 +01:00
Denny Biasiolli
435b392e92 legend: fix rendering in browsers other than Chrome when dataset.backgroundColor is Array 2016-06-03 11:39:30 +02:00
Noel
54d1e49bb7 Fix for chart title not updating 
https://github.com/chartjs/Chart.js/issues/2686

Chart options were using a cache value from initialize function.
Now updating values in the beforeUpdate lifecycle.
 2016-06-03 09:07:14 +01:00
Evert Timberg
7ea36aead3 Add a way to know when a resize occurs. 2016-06-02 20:43:38 -04:00
Evert Timberg
829c2be2bc Merge pull request #2680 from chartjs/fix/clipping 
Remove clipping and add plugin hooks.
 2016-06-02 20:35:39 -04:00
Evert Timberg
056ab9efa4 Merge pull request #2693 from ansballard/add-reference-to-chart 
Added a reference to Chart within Chart for Issue #2483
 2016-06-02 20:25:53 -04:00
Aaron Ballard
7f70afe864 Added a reference to Chart within Chart for Issue #2483 2016-06-02 16:04:33 -05:00
Zach Panzarino
016c2d8267 Update Contributing Guidelines 2016-06-02 10:52:19 -04:00
Evert Timberg
10f01088e4 add afterDatasetDraw in correct place 2016-06-01 07:18:27 -04:00
Evert Timberg
b96fdcaf85 Docs on new plugin callback 2016-05-31 22:28:22 -04:00
Evert Timberg
b22e32c007 Remove clipping and add plugin hooks. Zoom plugin can then do the clipping itself 2016-05-31 22:16:29 -04:00
Evert Timberg
a4ac33df5d Merge pull request #2671 from chartjs/bubble-controller-improvements 
Improve bubble, doughnut, and polar area controller minification and code duplication.
 2016-05-31 22:01:09 -04:00
Zach Panzarino
17bad9b37d Merge pull request #2678 from zachpanz88/doc-fix 
Fix doc syntax
 2016-05-31 13:51:22 -04:00
Zach Panzarino
0997cf71cc Fix doc syntax (#2673) 2016-05-31 17:50:02 +00:00
Evert Timberg
5367d56f49 Merge pull request #2675 from FROGGS/patch-1 
Fix links to 09-Advanced.md (was 07-Advanced.md)
 2016-05-31 11:52:51 -04:00
Tobias Leich
9d7a0fb93e Fix links to 09-Advanced.md (was 07-Advanced.md) 2016-05-31 15:26:34 +02:00
Evert Timberg
600f5b9ba0 Improve core and polar area 2016-05-30 21:55:58 -04:00