Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 04:39:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,292 Commits 8 Branches 114 Tags 67 MiB
35dcfe00b1
Commit Graph

356 Commits

Author SHA1 Message Date
unknown
924a5d0abc Merge remote-tracking branch 'chartjs-origin/master' 
Conflicts:
	src/core/core.legend.js
 2016-07-03 18:35:21 -06:00
Evert Timberg
b197fdae42 Merge pull request #2901 from moberwasserlechner/fix/2894 
Documentation fixes
 2016-07-03 17:09:30 -04:00
unknown
d381117236 Issue #2252, added usePointStyle option to allow label boxes to match the shape(pointStyle) of the corresponding data. 2016-07-03 13:55:43 -06:00
Michael Oberwasserlechner
1485778363 Finish incomplete sentence and remove trailing spaces. 2016-07-02 16:46:29 +02:00
Michael Oberwasserlechner
aed3d40263 add id property to common configuration 2016-07-02 16:42:36 +02:00
Michael Oberwasserlechner
2feebb1cd2 remove redundant option entry 2016-07-02 16:35:33 +02:00
Michael Oberwasserlechner
ae010a91b6 stepSize defined twice. renaming the first to fixedStepSize 2016-07-02 13:55:53 +02:00
Jim Kring
aa556540f4 Update 04-Bar-Chart.md 
Changed second instance of "Options for xAxes" heading to "Options for yAxes" since it is the heading for the y-axis options.
 2016-07-01 12:02:55 -07:00
Evert Timberg
900e1062ba Fix typo in docs 2016-07-01 08:55:35 -04:00
Adam Templeton
c39b8f6c78 made table more readable 2016-06-28 15:05:04 -05:00
Adam Templeton
a0a3561eef updated docs with new option 2016-06-28 14:59:22 -05:00
Evert Timberg
9082507c1c Merge pull request #2555 from simonbrunel/travis-dist 
Travis GitHub Releases
 2016-06-28 08:39:57 -04:00
Bartosz Łęcki
e1a1d9cd6d Change ID links for scales objects 2016-06-28 12:22:41 +02:00
Evert Timberg
5c36e0de65 Fix typo in tooltip docs 2016-06-23 19:40:45 -04:00
Evert Timberg
db8ed6a6c0 Span gaps option should be specified at the chart level 2016-06-20 14:42:09 -04:00
Simon Brunel
c6318749da Drop official support for Bower 
Remove the bower.json file and update the documentation with the alternative bower-npm-resolver solution.
 2016-06-18 12:18:30 +02:00
Simon Brunel
0579fbb741 Add download links to the latest version 
Remove outdated *standard build* and *bundled with Moment.js* links from the documentation and add a link to the latest GitHub release, from where the user can download `*.js` files.
 2016-06-18 12:14:30 +02:00
Evert Timberg
7be69ce7e3 Fix pointLabel docs typo 2016-06-11 09:24:55 -04:00
Simon Brunel
53eb7667dd New datasets update plugin extensions 
Add `beforeDatasetsUpdate` and `afterDatasetsUpdate` plugin notifications during the chart update. Plugins are able to cancel the datasets update by explicitly returning false to `beforeDatasetsUpdate`. For consistency, rename `(before|after)DatasetDraw` to `(before|after)DatasetsDraw`.
 2016-06-11 00:17:48 +02:00
Zach Panzarino
d901687c2d Remove link that doesn't exist anymore in scale docs 2016-06-10 15:00:17 +00: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
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
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
Evert Timberg
7ea36aead3 Add a way to know when a resize occurs. 2016-06-02 20:43:38 -04:00
Evert Timberg
b96fdcaf85 Docs on new plugin callback 2016-05-31 22:28:22 -04:00
Zach Panzarino
0997cf71cc Fix doc syntax (#2673) 2016-05-31 17:50:02 +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
876ddc8931 Update radial linear scale docs 2016-05-29 10:31:58 -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
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
327b8d82f5 Allow turning off lines on a per dataset basis 2016-05-27 22:20:51 -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
Roland Warmerdam
127ed8ddb3 docs: fix the bar chart default axis id's 2016-05-26 14:38:53 -07:00
Evert Timberg
81aedf4df0 Fix scale typos 2016-05-25 18:39:43 -04:00
Vanderhoven Nick
07b7db14e9 This fixes documentation issue #2628 2016-05-25 18:39:42 -04:00
Evert Timberg
e81299ded4 Improve line chart docs 2016-05-25 18:39:41 -04:00
Evert Timberg
4a25106239 Scale docs 2016-05-25 18:39:41 -04:00
Evert Timberg
9962017271 Improve configuration options 2016-05-25 18:39:41 -04:00
Evert Timberg
62b9a4b616 Fix section capitalization 2016-05-18 22:44:33 -04:00
Evert Timberg
dfcf874735 Update initial sample with colours 2016-05-18 22:10:20 -04:00
Evert Timberg
73610c00b4 Merge pull request #2596 from chartjs/fix/2406 
Give the doughnut sample the correct color label
 2016-05-18 21:46:42 -04:00
Evert Timberg
ff8eb5a65b Give the doughnut sample the correct color label 2016-05-18 21:43:01 -04:00
Evert Timberg
4a2c521115 Add a note about selecting the correct build that describes what the bundled versions do. 2016-05-18 21:31:51 -04:00
Evert Timberg
8445057432 Bubble chart docs 2016-05-18 21:05:20 -04:00
Evert Timberg
bc2ffb2321 Add new file for bubble chart docs 2016-05-18 19:15:11 -04:00
Zach Panzarino
529ebedc90 Add BrowserStack mention to readme and website 2016-05-18 12:32:09 +00:00
Ceane Lamerez
456ab9ca36 Fix #2574 - Add support to hide border on the chart 2016-05-17 21:35:19 +02:00
Zach Panzarino
974ff00464 Fix syntax error in docs (#2572) 2016-05-17 08:47:27 -04:00
Evert Timberg
5514ee07c1 Revert "Travis GitHub Releases" (#2553) 2016-05-14 18:08:38 -04:00
Simon Brunel
4e9e26c85d Travis GitHub Releases (#2552) 
* Make Travis to deploy built files for tags

See https://docs.travis-ci.com/user/deployment/releases

* Remove and ignore dist/* files

Travis now builds and deploys these files for all tags, so we don't need to have them on the repository anymore.

* Add download links to the latest version

Remove outdated *standard build* and *bundled with Moment.js* links from the documentation and add a link to the latest GitHub release, from where the user can download `*.js` files.
 2016-05-14 17:35:32 -04:00
Evert Timberg
568c61c56d fix docs for tension 2016-05-13 19:17:19 -04:00
Evert Timberg
691a7c6a4b Update doc files for ticks.minRotation 2016-05-12 18:42:52 -04:00
Evert Timberg
8c209405e9 Merge branch 'iso_weekday' of https://github.com/tomduncalf/Chart.js into tomduncalf-iso_weekday 
Conflicts:
	docs/01-Scales.md
 2016-05-12 18:24:14 -04:00
Evert Timberg
41c043dd23 Merge branch 'master' of https://github.com/nnnick/Chart.js 
Conflicts:
	docs/01-Scales.md
 2016-05-12 18:22:55 -04:00
Evert Timberg
38df95ee81 Merge pull request #2531 from matt-watson90/patch-1 
Fixed copy paste error in 01-Scales.md
 2016-05-12 12:09:39 -04:00
Matt Watson
41bf2418cb Fixed copy paste error in 01-Scales.md 2016-05-12 17:02:20 +01:00
cw0102
a6017a4196 Update 03-Bar-Chart.md 
Fix documentation of stacked option to be a subset of the axes rather than a global attribute on a bar chart. The attribute chart was inconsistent with the example below it.
 2016-05-12 11:56:04 -04:00
Tom Duncalf
7ee5af81af Add labelOffset option to scales 2016-05-11 10:43:22 +01:00
Tom Duncalf
8b3d079a50 Add isoWeekday option to allow time scale ticks in 'week' unit mode to start on a specified day of the week 2016-05-11 09:44:02 +01:00
Tarqwyn
84b7d07526 Following a Slack conversation tadd new Callback to allow updates to datasets config (ie borderColor) based on results of the calculated scale, A typical use case would be apply a Gradient fill. 
On branch feature_New_plugin_interface_afterScaleUpdate
Changes to be committed:
	modified:   dist/Chart.bundle.js
	modified:   dist/Chart.bundle.min.js

 #On branch feature_New_plugin_interface_afterScaleUpdate
 #Changes to be committed:
 2016-05-10 15:59:12 +01:00
Evert Timberg
23722a8b25 Make the afterUpdate plugin method more useful 2016-05-09 17:14:15 -05:00
William Entriken
8a46d1915d Casually codify 1.x policy. Fixes #2305 2016-05-08 15:02:32 -04:00
Evert Timberg
fc4c23c8d2 Allow updating scale defaults 2016-05-07 11:43:24 -04:00
Darren Keane
ad9f40f841 Update legend docs -> parameter 'data' has changed to 'chart'. 2016-05-05 16:59:44 +01:00
potatopeelings
c2cc3fbb4c Feature #73 - Horizontal Bar Chart (#2448) 
* Horizontal bar chart type

* Mentioned horizontal bar chart in bar documentation

* Sample file for horizontal bar chart

* Missing semicolon

* Fix for borderSkipped index
 2016-05-03 16:45:43 -05:00
Vincent Chan
29606ae21f changes repo link to chartjs org 2016-05-02 16:01:26 +02:00
Vincent Chan
adacef8194 fixes several anchors 2016-05-02 15:57:32 +02:00
Doug Molineux
4d8def904c Added a <br> 
The additional line will make the legend accessible.
https://github.com/chartjs/Chart.js/issues/2389
 2016-04-28 16:52:40 -06:00
Evert Timberg
03fb66751f Make animation options consistent for polar area and doughnut charts (#2342) 
* Make animation options consistent and fix an issue when `animateRotate === false` in the polar area chart

* Update docs for moved options

* Fix typo
 2016-04-27 16:07:21 -05:00
Nick Downie
daf04463c0 Link to 1.x documentation in notes 2016-04-27 19:48:05 +01:00
Sam Stevens
cdf0682e39 change the default setting for Chart.defaults.global.title.display from true to false in the docs to match the code 2016-04-27 12:34:58 +01:00
Daan De Meyer
73493e2c9e Added default ("left") for position field in global scale defaults. 
Documented scale position field in scale docs.
 2016-04-26 03:09:35 +02:00
Daan De Meyer
bb29401a0e Removed scale option from pie/doughnut docs (not used) 
Changed usages of tension in global element options and radar chart options to lineTension
 2016-04-26 02:54:16 +02:00
Daan De Meyer
768a3d1e9c -- Replaced '-' and 'Array' with 'Object' where appropriate 
-- Removed unnecessary options from bar chart options
 2016-04-26 01:59:11 +02:00
Daan De Meyer
61cef17f11 -- Removed linebreak added with previous fix 2016-04-26 00:28:02 +02:00
Daan De Meyer
b9eef5453a -- tension option should be lineTension 2016-04-26 00:09:41 +02:00
Evert Timberg
129ca591e6 Merge pull request #2360 from vincchan/fix-anchor 
Fixes anchor link in docs
 2016-04-25 13:58:50 -04:00
Vincent Chan
d0b5bb941d Fixes anchor link in docs 2016-04-25 19:17:47 +02:00
Vincent Chan
e6e03c29a3 fixes #2351 2016-04-25 16:47:36 +02:00
Evert Timberg
a417e78b80 Remove unnecessary partial sentence 2016-04-24 17:12:29 -04:00
Evert Timberg
57b4325709 Doc updates for other chart types 2016-04-24 17:07:41 -04:00
Evert Timberg
74199235d3 Point styles 2016-04-24 16:30:19 -04:00
Evert Timberg
1ce1f0c41a Line chart docs 2016-04-24 16:28:47 -04:00
Evert Timberg
e70a1c85cf Mention what type of color options are supported 2016-04-24 16:28:10 -04:00
Evert Timberg
c1d7725ae0 Merge pull request #2340 from DaanDeMeyer/documentation-fixes 
Documentation fixes
 2016-04-23 18:27:35 -04:00
Daan De Meyer
d1c3612a50 Changed occurrences of "charts.defaults.Bar" to "charts.defaults.bar" 2016-04-23 23:54:40 +02:00
Daan De Meyer
938ecdfc97 Changed occurrence of "charts.defaults.Line" to "charts.defaults.line" 2016-04-23 23:52:26 +02:00
Evert Timberg
b2e162f2d7 Merge pull request #2339 from nnnick/docs/2.0-updates 
Docs/2.0 updates
 2016-04-23 17:45:16 -04:00
Daan De Meyer
88148b41f5 Changed two occurrences of percentageInnerCutout to cutoutPercentage which is the actual field name in the doughnut/pie options 2016-04-23 22:55:16 +02:00
Daan De Meyer
f840216326 Added dots to labels options in global.defaults.legend . 2016-04-23 22:54:13 +02:00
Evert Timberg
d583a7bf19 Fix #2324 2016-04-23 10:45:23 -04:00
Nick Downie
907f0c9bba Update browser support spec for 2.0 2016-04-23 14:34:57 +01:00
Nick Downie
527e7d9b7a Update colours + example values in docs 2016-04-23 14:25:58 +01:00
Evert Timberg
32db92c7e1 Merge pull request #2314 from jachstet-sea/consistent_option_names_pt1 
Consistent option names pt1
 2016-04-22 22:52:34 -04:00
Evert Timberg
f6f8fe5959 Add in a beforeRender plugin event. Makes it easier to handle things that need to happen once at the start of animation but not on every frame 2016-04-22 21:04:55 -04:00
Jannis Achstetter
b21d147608 Update the docs 2016-04-21 16:29:05 +02:00
Jannis Achstetter
4d4271e6c4 Update the docs 2016-04-21 09:41:28 +02:00
Huw
719581e2e0 Fix tooltip example caretHeight to caretSize 2016-04-19 15:59:13 +01:00
Nick Downie
fa27842736 Split doughnut/pie example into two code block 
Odd change - but makes tempting the documentation a lot simpler
 2016-04-18 22:30:10 +01:00
Kammy
f006541652 fix typo 2016-04-19 00:31:19 +09:00
Evert Timberg
9abc63b11e Plugin event in destroy 2016-04-17 18:55:20 -04:00
Evert Timberg
43438d6303 Update doc version # 2016-04-17 12:39:09 -04:00
Evert Timberg
3f8681a1e4 Documentation for creating plugins 2016-04-17 12:25:58 -04:00
Evert Timberg
ca461479a8 Update docs 2016-04-16 21:50:45 -04:00
Evert Timberg
d5af01b2c7 Remove old doc files 2016-04-16 21:13:44 -04:00
Evert Timberg
c74196efc7 Update docs file for start angle and sweep properties 2016-04-16 21:10:31 -04:00
Tanner Linsley
af1adf6b84 Merge branch 'master' into v2.0-dev 2016-04-16 18:13:23 -05:00
Jamie Penney
8fca9540ab Document the point radius setting 2016-04-10 11:15:55 +12:00
Jamie Penney
8c2bc34b9c Fix whitespace in Line Chart documentation 2016-04-10 11:04:23 +12:00
Evert Timberg
488826ace3 Update doc file to indicate that category scale supports min/max attributes 2016-04-02 23:07:41 -04:00
Evert Timberg
0b56ea452f Minor doc fixes 2016-04-01 22:12:37 -04:00
Evert Timberg
f39fa53a7e Fix doc titles 2016-03-26 10:57:43 -04:00
etimberg
60a429f5cb Update doc version 2016-03-23 19:22:43 -04:00
Evert Timberg
bf724abe8b Fix axis IDs in documentation 2016-03-14 19:43:21 -04:00
Ivan Samoylenko
81e1448836 Added 'borderSkipped' parameter to Rectangle. 2016-03-13 18:58:36 +03:00
Aaron Miller
668b532fbe Add angleLineInterval option to radar chart 2016-03-13 09:59:19 -04:00
Ivan Samoylenko
72b0ef2df0 Missing whitespaces and code markup fixes 2016-03-13 14:47:37 +03:00
Evert Timberg
9bcc3ca34c Allow ticks.fixedStepSize or ticks.stepSize options to mean the same thing 2016-03-06 08:56:31 -05:00
Evert Timberg
c3f765857e Fix some time rounding problems 2016-03-05 22:58:34 -05:00
Matthias Winkelmann
d5f837843e Fixes nnnick/Chart.js#2086 by introducing a new time.parser option with high priority to replace the (deprecated) time.format 2016-03-02 13:53:35 +01:00
Evert Timberg
111ada730c Fix typo in docs. Fixes #1042 2016-02-15 16:42:23 -05:00
Tanner Linsley
eb2b04a9ff Documentation Updates for UMD support 2016-02-12 23:03:44 -07:00
Robert Becker
55f9b68b0c Updated build and documentation 2016-02-09 13:04:07 +01:00
Robert Becker
e9c18f603d Merged remote-tracking branch 'upstream/v2.0-dev' into v2.0-dev to fix conflicts. 
Refactored linear scale fixed step size implementation.
Added nbproject to .gitignore
 2016-02-09 12:56:16 +01:00
etimberg
37883689ad Fixes #1144 with an update to the docs to indicate that labels are required for each point 2016-02-07 19:58:15 -05:00
etimberg
ee16c1edbc Update docs for #1144 2016-02-07 19:55:32 -05:00
etimberg
9cf31da4c9 Add docs for global font options 2016-02-07 19:48:39 -05:00
Robert Becker
80ede9b9bb Added documentation for fixedStepSize. 
Reformatted scale.linear.js to match original indenting.
 2016-02-05 09:28:50 +01:00
Mathias Küsel
655c1152eb Adds different point styles 2016-01-16 18:07:57 +01:00
Mathias Küsel
24e4a924c4 Add option to disable line drawing 2016-01-14 13:39:06 +01:00
Evert Timberg
5070059ac1 Add template option for point labels + test + doc update 2016-01-09 14:39:43 -05:00
Tyler Romeo
c5f141306f Added documentation about tooltip templates 
It can be a little unclear what the actual format for tooltip templates are. Added information concerning how the tooltip templates are evaluated, and what context, i.e., variables, is available inside of them.
 2016-01-08 20:02:45 -08:00
Morley Zhi
84a6eb4a3b Updates 
(1) Only limit gridlines when maxTicksLimit is defined, so we don't blow up the tests.
(2) Add a note about running tests in CONTRIBUTING.md
(3) Rebuild files
 2016-01-07 11:40:26 -05:00
Morley Zhi
6478f93ded Use ticks.maxTicksLimit to limit gridlines (fixes #1859); use getValueOrDefault for resolving the maxTicksLimit option 2016-01-07 10:44:56 -05:00
Evert Timberg
5a5d698b11 Fix some errors with docs that were noticed when building 2015-12-28 08:29:54 -05:00
Damian Silbergleith Cunniff
fd2344dd5f Update the docs to reflect the new feature 2015-12-26 09:47:59 -07:00
Prashanth Chandra
8e7162ca91 Add missing comma 2015-12-22 17:50:11 +08:00
Evert Timberg
63b14dc2a9 Merge pull request #1810 from olyckne/fix/ticks_callback 
Fix ticks callback and auto skip
 2015-12-21 08:23:55 -05:00
Mattias Lyckne
888a8dd797 Update docs 2015-12-21 14:21:51 +01:00
Evert Timberg
5f4e8a4c13 Merge pull request #1794 from nnnick/update-scale-lifecycle 
Update Scale Lifcycle
 2015-12-19 14:29:49 -05:00
akagroundhog
421e294e2c xPadding/yPadding fix in 00-Getting-Started.md 
xPadding is horizontal padding (left & right), yPadding is vertical padding (top & bottom).
 2015-12-19 00:19:32 +03:00
Evert Timberg
c8d3831152 Split out data limits step of scales into it's own step. Wire up callbacks from the options to those in the scale life-cycle. Updated the docs accordingly 2015-12-17 09:21:04 -05:00
etimberg
9aee15fe6c Updated docs 2015-12-15 20:19:32 -05:00
Evert Timberg
6d490fbbbb Merge pull request #1779 from olyckne/adds_min_and_max_to_y_axes 
Adds min and max setting to axes
 2015-12-14 21:55:17 -05:00
Mattias Lyckne
968db4e783 Adds min and max setting to axes 2015-12-14 09:22:34 +01:00