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,858 Commits 8 Branches 114 Tags 67 MiB
959b4eedf6
Commit Graph

1858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Evert Timberg
11345b6c89 Polar area controller improvements 2016-05-30 21:42:15 -04:00
Evert Timberg
a5167cc42d Reduce duplicated code in doughnut controller 2016-05-30 21:33:11 -04:00
Evert Timberg
fcff496301 Improve bubble controller minification and code duplication. 2016-05-30 19:07:31 -04:00
Evert Timberg
daeb804358 Merge pull request #2668 from zachpanz88/restructure-issues 
Change templates for issues/PRs
 2016-05-30 11:46:05 -04:00
Zach Panzarino
99c5b672f0 Change templates for issues/PRs 2016-05-30 15:37:19 +00:00
Evert Timberg
bd6c4870af Update colors for chart that is created 2016-05-29 16:30:31 -04:00
Evert Timberg
a5ab4521a1 Merge pull request #2661 from chartjs/tooltip-improvements-and-tests 
Improve tooltip performance and added new options
 2016-05-29 12:10:30 -04:00
Evert Timberg
d29a0158b8 Merge pull request #2664 from chartjs/fix/1980-and-2662 
Linear and RadialLinear scales now derive from a common base class
 2016-05-29 10:49:00 -04:00
Evert Timberg
876ddc8931 Update radial linear scale docs 2016-05-29 10:31:58 -04:00
Evert Timberg
3cd21c8053 Linear and RadialLinear scales now derive from a common base class 2016-05-29 10:16:47 -04:00
Evert Timberg
8e8cc5b61f Merge branch 'tooltip-improvements-and-tests' of https://github.com/nnnick/Chart.js into tooltip-improvements-and-tests 
Conflicts:
	test/core.tooltip.tests.js
 2016-05-28 21:17:30 -04:00
Evert Timberg
6bc917c8e3 Improve testing on the CI 2016-05-28 21:08:20 -04:00
Evert Timberg
6667832392 Fix CI & JShint issues 2016-05-28 21:01:10 -04:00
Evert Timberg
da1c51f149 Improve testing on CI 2016-05-28 20:55:20 -04:00
Evert Timberg
b646f6d816 Add a way of sorting tooltip items with a custom sort function 2016-05-28 20:47:36 -04:00
Evert Timberg
af5344462e Improve tooltip minification 2016-05-28 19:39:15 -04:00
Evert Timberg
8d20379e29 Initial tooltip tests + fix a bug when the tooltip beforeLabel and afterLabel callbacks returned strings 2016-05-28 15:26:46 -04:00
Evert Timberg
9269411799 Merge pull request #2657 from chartjs/tooltip-color-callback 
Provide a way to configure the colour of tooltip items
 2016-05-28 12:14:27 -04:00