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,947 Commits 8 Branches 114 Tags 67 MiB
bddc870201
Commit Graph

1947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Evert Timberg
c1b8839a69 Merge pull request #2660 from chartjs/fix/2613 
When destroying the chart, any animations should be stopped.
 2016-05-28 11:26:09 -04:00
Evert Timberg
f247536b4a When destroying the chart, any animations should be stopped. 2016-05-28 11:05:02 -04:00
Evert Timberg
528680d666 Merge pull request #2658 from chartjs/fix/2580 
Allow turning off lines on a per dataset basis
 2016-05-28 10:56:25 -04:00
Evert Timberg
d79bcb74ba Merge pull request #2659 from chartjs/fix/2639 
Fix pie custom tooltip sample
 2016-05-28 10:52:42 -04:00
Evert Timberg
1b277a71e4 Fix pie custom tooltip sample 2016-05-28 10:48:33 -04:00
Evert Timberg
327b8d82f5 Allow turning off lines on a per dataset basis 2016-05-27 22:20:51 -04:00
Evert Timberg
b3f8a53ea5 Merge pull request #2640 from chartjs/legend-and-title-as-plugins 
Legend and title as plugins
 2016-05-27 21:19:28 -04:00
Evert Timberg
66aa65be68 Tooltip now has a callback for configuring the colors of items displayed. Added docs and improved the options passed to the tooltip 2016-05-27 21:07:02 -04:00
Evert Timberg
bcd17e5840 Merge pull request #2649 from chartjs/fix/2647 
Line points always need to pivot
 2016-05-26 20:23:10 -04:00
Evert Timberg
c6eb8bf58c 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. 2016-05-26 20:02:46 -04:00
Evert Timberg
464adcc94b Merge pull request #2648 from chartjs/fix/2607 
Don't use translates and rotates for drawing rotated rectangles
 2016-05-26 19:42:37 -04:00