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
2,454 Commits 8 Branches 114 Tags 67 MiB
26c1936dee
Commit Graph

1228 Commits

Author SHA1 Message Date
Evert Timberg
67b3d32218 Initial implementation of a scatter chart. Uses a new style of config from the other charts. For now, the config is not changeable. 2015-05-17 13:20:37 -04:00
Evert Timberg
db1365c8ce Initial check in of the scale service and the scale constructor registration. An initial implementation of a linear scale that can be drawn in both horizontal and vertical orientations. 2015-05-16 19:40:52 -04:00
Evert Timberg
b5b0081108 Some helper functions needed for better scales. 2015-05-16 19:38:31 -04:00
Tanner Linsley
fff81c455d Tooltip Position, Active Element Position, Tooltip animation follow 2015-05-15 23:07:21 -06:00
Tanner Linsley
ad972a0c5c Pie cleanup. 2015-05-15 22:45:17 -06:00
Tanner Linsley
872c92cd4b Doughnut/Pie Chart refactor 2015-05-15 22:34:08 -06:00
Tanner Linsley
1d8d19d404 Prettified, and half way through doughut 2015-05-15 20:54:01 -06:00
Tanner Linsley
ed6f234205 Bar chart pivot fix 2015-05-15 17:14:09 -06:00
Tanner Linsley
09c11440dd inGroupRange function for bar charts label mode 2015-05-15 17:07:41 -06:00
Tanner Linsley
e58421a08a Line Chart label hoverMode & tooltips 2015-05-15 17:03:51 -06:00
Tanner Linsley
fb580a6e48 lineChart single hoverMode tooltips, fallbackColor global 2015-05-15 16:40:01 -06:00
Tanner Linsley
f79ebdaa88 Stable Bar Chart, DRY core functions 2015-05-15 00:04:42 -06:00
Tanner Linsley
b432a3d6db labelMode tooltips and hover events 2015-05-14 23:18:47 -06:00
Tanner Linsley
ef4c46f2be labelMode Tooltips almost there! 2015-05-14 17:25:56 -06:00
Tanner Linsley
4ef57315da Getting into 'label' hoverMode tooltips 2015-05-12 17:22:47 -06:00
Tanner Linsley
63e115e7a8 hoverMode: "single" tooltips 2015-05-12 15:47:24 -06:00
Tanner Linsley
9f98334d6f Mid-code commit 2015-05-12 15:42:20 -06:00
Tanner Linsley
15f724f146 Rough Tooltips for 'single' hoverMode 2015-05-12 12:55:48 -06:00
Tanner Linsley
afb22d15ae Better events 2015-05-12 10:35:55 -06:00
etimberg
460399f651 Merge branch 'fix/bar_chart_negative_values' of https://github.com/etimberg/Chart.js into etimberg-fix/bar_chart_negative_values 
# Conflicts:
#	samples/bar.html
#	src/Chart.Bar.js
#	src/Chart.Core.js
 2015-05-12 08:00:14 -04:00
Tanner Linsley
9e4d90e110 Color Animation, Color Autopilot 2015-05-12 01:13:16 -06:00
Tanner Linsley
df91739b77 hoverMode, onHover, key fixes 2015-05-11 19:43:17 -06:00
Tanner Linsley
d3f7071983 Merge pull request #1114 from etimberg/feature/get_bar_at_event 
Create a getBarAtEvent function that returns the single bar that was clicked on
 2015-05-11 19:27:52 -06:00
etimberg
d287a01b44 Make sure that the _start item is cleaned up during save. 2015-05-11 21:22:37 -04:00
Tanner Linsley
0e29cfdfda Bar attempt #5 2015-05-11 18:12:44 -06:00
Tanner Linsley
cf07df07d6 Bar Attempt # 4 2015-05-08 16:20:21 -06:00
Tanner Linsley
4b34bbadf9 Merge pull request #1098 from WouterSioen/fix-typo 
Fix typo
 2015-05-05 16:01:30 -06: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
Evert Timberg
e13ada2b43 Ensure that the bar draws to the correct spot 2015-05-02 15:03:40 -04:00
Evert Timberg
62b29282fd Fix a minor bug 2015-05-02 14:59:33 -04:00
Evert Timberg
2814c8e44c Remove Math.sign 2015-05-02 14:56:16 -04: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
e67d198e69 Create a getBarAtEvent function that returns the single bar that was clicked on 2015-04-18 09:56:40 -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
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
William Entriken
b0a780822a Merge pull request #1025 from pijey/feature/offsetgridlines-linechart 
Add offsetGridLines option to Line charts
 2015-04-16 15:27:43 -04:00
William Entriken
889c9de779 Merge #756 Fixes #661 2015-04-16 15:17:28 -04:00
Evert Timberg
604d6bd4e3 Merge pull request #677 from rylanhalteman/fix-yLabel-padding 
add 10 to yLabelWidth on set, rather than on use
 2015-04-12 08:06:23 -04:00
Tanner Linsley
14f4fae786 Only start digest on first request. Cleanup 2015-04-12 00:05:31 -06:00
Evert Timberg
c476db0dd7 Use findNextWhere correctly. 2015-04-11 23:05:05 -04:00
Evert Timberg
0a5f92a854 Remove the minAnimationSteps option since we did not end up needing it. 2015-04-11 21:11:49 -04:00
Evert Timberg
b1cbf04f25 Remove the unused lastTimeRun from the animation service 2015-04-11 20:47:35 -04:00
Tanner Linsley
70b8bf106c Always execute last frame 2015-04-11 18:42:11 -06:00
Tanner Linsley
99bf85e913 Merge remote-tracking branch 'origin/animation-refactory' into animation-refactory 
Conflicts:
	src/Chart.Core.js
 2015-04-11 18:37:01 -06:00
Tanner Linsley
e0c208be58 Frame Dropper 2015-04-11 18:34:06 -06:00
Evert Timberg
26eca23706 Implement cancel animation frame in the animation service 2015-04-11 20:17:46 -04:00
Evert Timberg
98253fea5d Fix some bugs in the animation stuff 2015-04-11 20:08:17 -04:00
Evert Timberg
9a13dd78fc Fix a typo 2015-04-11 19:42:54 -04:00
Evert Timberg
3e59438646 Integrate animation service with chart 2015-04-11 19:33:20 -04:00
Tanner Linsley
7a6f2b4f06 Src changes... derrrr 2015-04-11 17:30:06 -06:00
Evert Timberg
d3579334b2 Add an option to control the minimum number of animation steps. 2015-04-11 19:17:30 -04:00
Evert Timberg
0b8fd966ff Chart animations will now use the animation service provided in Chart.animationService. 2015-04-11 19:02:50 -04:00
Evert Timberg
972bc5636d Merge pull request #711 from cmweiss/master 
Default color for Doughnut/Pie
 2015-04-09 11:25:45 -04:00
dima117
4009dbd6a0 helpers.generateLabels throws "labelTemplateString is not defined" exception #1035 2015-03-31 22:06:41 +03:00
pijey
2677360f4b Add offsetGridLines option to Line charts 2015-03-25 11:51:56 +01:00
William Entriken
8e5f1d9667 Merge pull request #575 from msrocka/master 
fix #570: getDecimalPlaces throws error
 2015-03-17 09:28:54 -04:00
William Entriken
47d23601b1 Fix CodeClimate issues 2015-03-16 19:14:36 -04:00
Moshe Brevda
3e6883bdc0 Use default canvas size if one cannot be intelligently procured 2015-03-16 13:58:09 +02:00
Evert Timberg
ae7552a916 Draw bar chart negative values down from the 0 point of the scale. If all values are negative, draw down from the top. Updated the sample file to allow for negative bars. 2015-03-15 16:04:55 -04:00
Nick Downie
4b120ccbe9 Merge pull request #982 from nnnick/fix/automatic-chart-size-src 
Target src files from #142
 2015-03-09 17:20:29 +00:00
Nick Downie
de564326b0 Target src files from #142 2015-03-09 17:14:09 +00:00
Nick Downie
154ce016cc Ensure cancelAnimFrame has no function context 2015-03-09 17:05:20 +00:00
Steven Wexler
24248120a9 Removed an unnecessary comment 2015-03-01 20:31:44 -05:00
Jake
019e985c8f Merge pull request #898 from etimberg/fix/line_chart_single_label 
Fix a divide by 0 error when there is only 1 label
 2015-02-24 15:00:53 -05:00
Mike Smiley
ff493738a2 add datasetLabel for multiTooltip on dynamically-added points 2015-02-24 14:19:01 -05:00
Christopher Weiss
bb6237a15e Accidentally left in Array.prototype.map. 2015-01-30 11:12:08 -05:00
Christopher Weiss
b8b7c85c5e Using helper.each instead of Array.prototype.map 2015-01-30 11:01:44 -05:00
William Entriken
9c6a7397b5 Merge pull request #867 from bendxn/master 
Doughnut charts handling negative values
 2015-01-29 16:54:45 -05:00
Evert Timberg
2e0211320b Fix a divide by 0 error when there is only 1 label 2015-01-27 18:31:03 -05:00
Bjørnar Grip Fjær
6f6f80e6d7 Fix issue with "Illegal invocation" in cancelAnimFrame. 2015-01-27 19:14:00 +01:00
Ben Dixon
13396c72b3 Merge remote-tracking branch 'upstream/master' 2015-01-26 18:49:17 -06:00
Christopher Weiss
b9776736d4 Removed custom hue(), using hsl() 2015-01-26 16:28:11 -05:00
William Entriken
06adbb0c54 Merge pull request #703 from etimberg/fix/polar_area_update 
Ensure that scales for polar area graphs are regenerated on updates.
 2015-01-23 15:15:58 -05:00
Ben Dixon
d051dfe47f handling negative values in doughnut charts 2015-01-15 13:40:08 -06:00
Ben Dixon
06b02e9c33 Revert "doughnut charts handling negative values" 
This reverts commit 8b3a98f242.
 2015-01-15 13:38:20 -06:00
Ben Dixon
8b3a98f242 doughnut charts handling negative values 2015-01-15 13:31:54 -06:00
Tanner Linsley
026611110a Updated Samples 
Samples now include a “Randomize Data” button which utilizes the latest
changes.
 2015-01-08 10:13:14 -07:00
Tanner Linsley
359e94151c Data editable from chart config 2015-01-07 21:45:50 -07:00
Nick Downie
bdb49e6396 Merge pull request #611 from fntneves/feature/toggle-grid-lines 
Add option to toggle grid vertical/horizontal lines
 2015-01-07 22:44:59 +00:00
Nick Downie
05dbcd3a72 Merge pull request #840 from tannerlinsley/master 
External Tooltips, Documentation and Samples
 2015-01-07 22:44:02 +00:00
Tanner Linsley
64de3eb711 externalTooltips now labeled customTooltips 2015-01-06 22:53:30 -07:00
Nick Downie
85f3755f9a Restore original canvas context when destroying 2015-01-06 23:44:51 +00:00
Jake
5d4e7cebea Update Chart.Core.js 2015-01-04 17:12:58 -05:00
Nick Downie
81d4f97abc Remove unnecessary semicolons 2015-01-03 15:40:47 +00:00
Nick Downie
2e4bb1899f Fix mixed whitespace 2015-01-03 15:40:33 +00:00
Tanner Linsley
8c1e9588a1 External Tooltips, Documentation, and Samples 2014-12-30 13:05:11 -07:00
chad
a7712e8c71 prevent divide by zero error when calculating a circumference 2014-11-13 11:36:13 -06:00
Jerome Touffe-Blin
1900c3b0f3 Fix #507 - calculate container width and heigh without padding 2014-10-25 13:21:52 +11:00
Christopher Weiss
73faf3413b Update Chart.Doughnut.js 2014-10-21 13:32:45 -04:00
Christopher Weiss
fdc9be3e23 Correction in algorithm. 2014-10-21 13:28:45 -04:00
Christopher Weiss
686ea49953 Hue uses switch & fixed other problems. 2014-10-21 10:08:54 -04:00
Christopher Weiss
ae9eaa95c7 hue() complete but undebugged. 2014-10-20 22:18:50 -04:00
Christopher Weiss
e21147cbb9 Prototype for hue() & default fillColor to use it. 2014-10-20 21:49:41 -04:00
Evert Timberg
98c1ac439d Ensure that scales for polar area graphs are regenerated on updates. 2014-10-19 20:04:21 -04:00
Rylan Halteman
5ab5e8400a add 10 to yLabelWidth on set, rather than on use 2014-10-08 11:36:39 -04:00
Francisco Neves
a3daf1ca24 Add option to toggle grid vertical/horizontal lines 2014-09-08 16:10:45 +01:00
msrocka
5282c63ec3 fix #570: getDecimalPlaces throws error 2014-08-25 13:29:22 +02:00
chandruxp
47cf4f4814 Fix for Almond AMD 2014-08-20 15:20:46 -04:00
Nick Downie
10a9ef46cb Add in extra bezier debug point 2014-08-17 23:14:30 +01:00
Nick Downie
179d80a93b Cap bezier handles inside the scale 2014-08-17 22:32:36 +01:00
Nick Downie
48f10196f6 Use null checking for which points to draw/bezier 2014-08-03 19:20:31 +01:00
Nick Downie
bd25b5c7fd New methods for array finding 2014-08-03 19:19:54 +01:00
Nick Downie
09c0f3308c Whitespace cleanup 2014-08-03 16:39:04 +01:00
Nick Downie
30777e4a87 Merge branch 'master' into fix/sparse-datasets 
Conflicts:
	Chart.min.js
 2014-08-03 16:05:34 +01:00
Nick Downie
92e73bd28a Merge pull request #490 from nnnick/feature/version-bump 
Create a task to bump + write version numbers
 2014-07-27 22:59:14 +01:00
Nick Downie
5683c11ebd Merge pull request #438 from Miosss/templateEnchanceme 
Alternative scale templating. Passing function as template.
 2014-07-27 22:58:06 +01:00
Nick Downie
adf6f3abb2 Create a task to bump + write version numbers 
Also run `gulp release` to tag the latest release.
 2014-07-27 21:41:49 +01:00
Andy Burke
16cf465575 Add a small amount to docs. 2014-07-10 17:47:02 -07:00
Andy Burke
997a216b50 Allow for responsive charts to take up entire container by setting responsive: true and maintainAspectRatio: false. 2014-07-10 17:45:17 -07:00
Miosss
d193951dc5 Alternative templating, cleanup. 
Just added brackets.
 2014-07-10 13:13:38 +02:00
Miosss
c37c58ad39 Alternative scale templating. Passing function as template. 
Allows to choose template mechanism - processing function or original micro templating.
 2014-07-09 14:57:08 +02:00
Nick Downie
aa7975e4f7 Allow radar charts sparse data 2014-07-08 22:59:50 +01:00
Nick Downie
fdfa9912e8 Refactor logic into shared Element method 2014-07-08 22:44:55 +01:00
Nick Downie
2f59921f7a Make a start on sparse data for line charts 2014-07-08 22:40:32 +01:00
Nick Downie
e25fd5e37c Create null value bars, and hide if not numeric 2014-07-08 22:27:39 +01:00
Nick Downie
5d0171e8ed Check MultiTooltip elements are numeric 2014-07-08 22:19:36 +01:00
Nick Downie
2b81ac832a Merge pull request #415 from nnnick/fix/radar-chart-scale-updates 
Reflow the Radar before updating to update scale
 2014-07-02 21:36:51 +01:00
Nick Downie
3f9e5ab7a2 Merge pull request #414 from nnnick/feature/dataset-label-tooltip 
Add datasetLabel to elements for tooltip templates
 2014-07-02 21:36:39 +01:00
Nick Downie
23deaa9307 Merge pull request #413 from nnnick/fix/sparse-dataset-tooltip 
Prevent spare datasets from breaking MultiTooltips
 2014-07-02 21:36:28 +01:00
Nick Downie
ea9d144c71 Reflow the Radar before updating to update scale 2014-07-02 21:28:59 +01:00
Nick Downie
7a23131366 Add datasetLabel to elements for tooltip templates 2014-07-02 21:27:03 +01:00
Nick Downie
d7632efe65 Prevent spare datasets from breaking MultiTooltips 2014-07-02 21:09:04 +01:00
Brett Bukowski
477e09f1d4 Add support for CommonJS module definition 2014-07-01 15:39:28 -06:00
Nick Downie
29ae3200a7 Default display of chart point to true 2014-06-30 21:54:24 +01:00
Nick Downie
38d1b87e1c Adhere to pointDot option in config 
- Added `display` property on Point classes, to determine whether the
draw sequence should run or not.
 2014-06-30 20:24:47 +01:00
Nick Downie
10227f852b Add src & built library files 2014-06-29 18:36:25 +01:00