Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-19 06:36:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
364 Commits 12 Branches 121 Tags
131b18059a095502f14d1da0374a9b9155eac87e
Commit Graph

144 Commits

Author SHA1 Message Date
David Cochrum
cf47543243 Fix multi-dataset bar highlighting and bar highlight color logic 2016-03-11 12:16:43 -05:00
Evert Timberg
3f2119526d Fix #2102 2016-03-06 19:03:03 -05:00
Evert Timberg
ea0d93c970 Merge pull request #1070 from mackuba/stop_animations 
Stop animations when destroying a chart
 2016-02-27 15:46:05 -05:00
Evert Timberg
43606d1faa Merge pull request #1334 from thePanz/patch-2 
Fix error in generateLegend() function
 2016-02-20 13:29:32 -05:00
William Entriken
6009b00f74 Merge pull request #1886 from coolbombom/patch-4 
having differnt colors in one dataset
 2016-02-20 13:11:16 -05:00
Evert Timberg
4aa274d5b2 Default multiTooltipTemplate now shows the dataset label + updated built files. Fixes #612 2016-02-15 14:43:34 -05:00
Evert Timberg
4f4f804a71 Use a named define to fix #768 2016-02-15 14:38:11 -05:00
etimberg
cf0b550a80 Check to ensure dom node exists when calculating size. Fixes #919 2016-02-07 19:23:54 -05:00
coolbombom
3f658555ba I will try again! 
had a bad effect on color that was not array .... fully tested now, is working in my solution!
 2016-01-11 12:48:09 +01:00
coolbombom
1f1e6b4e44 minor update, missed a small detail sorry!!! 
missed a small detail, resolved in an error, sorry!
 2016-01-11 12:17:08 +01:00
coolbombom
3ac54b8790 having differnt colors in one dataset 
Hi updated the bar chart so the bars can have different colors in one dataset!

cheers
c_bb
 2016-01-11 12:02:32 +01:00
Michaël Arnauts
57bd8c7715 Ignore null values when calculating scale 2016-01-09 12:04:29 +01:00
Damian Silbergleith Cunniff
cebbca67d1 Choose a "better" set of 12 default colors/highlight colors for pie charts 2015-12-27 09:14:15 -07:00
Damian Silbergleith Cunniff
c47e4c1da1 Change reference to index to prevent running off the end of the array 2015-12-26 15:36:15 -07:00
Damian Silbergleith Cunniff
b06344563d spaces -> tabs 2015-12-26 10:04:29 -07:00
Damian Silbergleith Cunniff
77185993df fix spaces -> tabs 2015-12-26 10:01:06 -07:00
Damian Silbergleith Cunniff
e949edacf5 Update the pie chart to use the default color/highlight if none is specified 2015-12-26 09:41:31 -07:00
Damian Silbergleith Cunniff
a868a2f61e Add default global values for Color and Highlight color 2015-12-26 09:34:43 -07:00
Evert Timberg
ee6aabaffc Merge pull request #1302 from jantimon/master 
More robust in-between arc calculation see #1301
 2015-12-25 17:44:26 -05:00
Evert Timberg
69695235ac Merge pull request #1771 from ryoon/recent-firefox 
Remove Firefox workaround
 2015-12-25 13:39:21 -05:00
Evert Timberg
f63debe2c7 Merge pull request #1040 from dima117/master 
fix multiTooltip appearance with empty title
 2015-12-24 21:50:18 -05:00
Ryo ONODERA
e94bd460a7 Remove Firefox workaround 
The workaround for older Firefox should be removed, because latest
supported Firefox 38.4.0/42.0 do not require it.
And it has side effect like #1198 or my problem on Kintone on cybozu.com.
 2015-12-12 09:00:12 +09:00
Evert Timberg
4297672424 Merge pull request #1092 from tannerlinsley/negative-arcs-fix 
Only draw positive radius arcs Fixes #592
 2015-11-16 21:17:46 -05:00
Evert Timberg
a169e5ad41 Merge pull request #1262 from mattclegg/master 
Call onAnimationComplete when reached last frame
 2015-11-01 17:11:24 -05:00
Evert Timberg
dd4a67e85c Merge pull request #1067 from rvaidya/master 
Added a scaleBackgroundColors configuration option for radar charts, to...
 2015-09-17 17:28:00 -04:00
Tanner Linsley
2fff73f9e3 Merge pull request #1397 from coolbombom/patch-3 
Fix scale error before animation complete
 2015-08-28 16:29:30 -06:00
Tanner Linsley
1ae2884a04 Merge pull request #1402 from hrniels/tooltip 
Added tooltipTitleTemplate option.
 2015-08-28 16:28:11 -06:00
Evert Timberg
2b9a575d4d Merge pull request #1389 from ericjperry/fix/datasetStroke 
The datasetStroke option has been fixed for line graphs
 2015-08-22 09:39:20 -04:00
Nils Asmussen
a14309d95f Added tooltipTitleTemplate option. 2015-08-22 13:47:01 +02:00
coolbombom
80ba5aa1c5 error thrown 
error thrown (TypeError: this.scale is undefined) if destroy is called before animation is complete, this update fix this error!
 2015-08-21 10:53:52 +02:00
Internalfx
ac5bf729c5 Closes #1309 
Doughnut.addData() broken for index of 0 #1309
 2015-08-18 18:39:11 -07:00
Eric Perry
3f77eb83b2 The datasetStroke option has been fixed for line graphs 2015-08-18 17:56:19 -04:00
Ema Panz
d7ee18372a Fix error in generateLegend() function 2015-07-25 17:32:58 +02:00
Jan Nicklas
0bb3a9b024 Fix typo 2015-07-10 11:53:35 +02:00
Jan Nicklas
961fd11098 More robust in-between arc calculation see #1301 2015-07-10 11:47:48 +02:00
mattclegg
d5f1738a3f Merge branch 'master' of github.com:nnnick/Chart.js 
# By Amir E. Aharoni
# Via Amir E. Aharoni (1) and Evert Timberg (1)
* 'master' of github.com:nnnick/Chart.js:
  Fix the spelling of "separate"
 2015-06-30 11:13:37 +01:00
mattclegg
f7e3962087 Call onAnimationComplete when reached last frame 2015-06-30 11:13:30 +01:00
Amir E. Aharoni
02616b9f17 Fix the spelling of "separate" 2015-06-23 01:01:59 +03:00
Leigh Quince
73b0d587ba fix for radar chart ignoring datasetFill option 2015-05-20 21:53:30 +02:00
Vanessa Ung
598a6f3485 Fixes #886 - Close span tags properly in legend generation template. 2015-05-16 15:31:56 +10:00
Tanner Linsley
b8691c9581 Revert "Merge pull request #856 from tannerlinsley/editable-chart-config" 
This reverts commit a8063de6b8, reversing
changes made to 7f513b87ee.
 2015-05-11 18:57:14 -06:00
Wouter Sioen
aad966820e Fix a typo: segment vs segement 
Fix typo in PolarArea

Update 04-Polar-Area-Chart.md
 2015-05-05 16:31:00 +02:00
William Entriken
5443886ec3 Merge pull request #1068 from nnnick/animation-refactory 
Animation refactory
 2015-05-04 15:55:59 -04:00
William Entriken
a8063de6b8 Merge pull request #856 from tannerlinsley/editable-chart-config 
Data now editable right from chart config
 2015-05-04 15:28:03 -04:00
Tanner Linsley
1df2b37bc5 Only draw positive radius arcs Fixes #592 2015-04-30 15:49:52 -06:00
William Entriken
7f513b87ee Merge pull request #952 from msmiley/patch-1 
add datasetLabel for multiTooltip on dynamically-added points
 2015-04-24 16:32:24 -04:00
William Entriken
a3d4bc0bfe Merge pull request #851 from jtblin/master 
Fix #507 - calculate container width and heigh without padding
 2015-04-24 10:28:29 -04:00
Evert Timberg
b5692c8534 Merge pull request #1069 from mackuba/fix_endpoint 
Prevent taking vertical space for X labels more than once
 2015-04-17 06:33:42 -04:00
Kuba Suder
66f7f96d4b stop animations when destroying a chart 
otherwise the animation keeps updating the chart for some time after it
was supposed to be destroyed, and when the canvas might have been
already reused for a new chart
 2015-04-16 22:41:53 +02:00
Kuba Suder
2e311896ad prevent taking vertical space for x labels more than once 
calculateXLabelRotation() subtracts space needed for x labels from
this.endPoint, but if this block is called more than once then the space
is subtracted more than once and the chart gets smaller and smaller with
every iteration
 2015-04-16 22:23:17 +02:00