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
Simon Brunel
52cdff5fc1 Merge pull request #3254 from ianks/minDisplayFormat 
Suport minUnit for time scale
 2016-09-08 13:34:53 +02:00
Ian Ker-Seymer
7af6e7f192
Suport minUnit for time scale 
When dealing with time-delineated datasets, often we have data for known
intervals of time. For example, we may have a dataset which represents number
of purchases per day:

```json
{
	labels: ['2016-01-01', '2016-01-02', '2016-01-03']
	datasets: [
		{
			data: [12, 87, 42]
		}
	],
	'...': '...'
}
```

In this case, Chart.js will attempt to figure out the best interval to display
the data, and could pick `hours` as the unit. However, in this case, we would
prefer to just use the `days` interval since our data's granularity can not be
represented well with `hours`.

To remedy this, this commit adds the `minUnit` option which allows
users to (optionally) specify what the minimum unit they would like
to use.
 2016-09-06 13:11:06 -04:00
Simon Brunel
69ab0d3e23 Use gulp-eslint instead of gulp-jshint 
Change the linter in gulp tasks to be consistent with Code Climate results which are based on ESLint using .eslintrc options. However, defaults Code Climate rules are too strict, so turn as warnings the 'complexity' and 'max-statements' rules (other errors has been fixed). Note that the Gulp task name has been changed for `gulp lint`.
 2016-09-03 18:42:22 +02:00
Simon Brunel
cd50edbc84 #3182 Gulp task to generate bower.json file 2016-08-28 18:21:10 +02:00
Evert Timberg
89531c6b93 Merge pull request #3112 from MatthieuRivaud/MonotoneCubicInterpolation 
Monotone cubic interpolation
 2016-08-22 17:53:31 -04:00
Evert Timberg
c94673e55a Merge pull request #3128 from vermeeca/3127-tooltip-sort 
Accept chart data to itemSort callback for Tooltips
 2016-08-22 17:53:11 -04:00
mdewilde
e1995473f0 Document possible options for animation.easing (#3111) 
List all possible values for animation.easing and reference URL with more information (taken from code comment).
 2016-08-21 23:00:29 +02:00
Karthik Iyengar
349a8a33ea Added borderDash support for grid lines (#3136) (#3142) 
* Added borderDash support for grid lines (#3136)

* Save and restore context to prevent border dash being applied to other elements

* Adds support for borderDashOffset, checks for setLineDash (IE9/IE10)

* Fixes tests
 2016-08-12 12:31:54 -04:00
Craig Vermeer
88de438c0e 3127 - Modify the itemSort callback for tooltips to accept a third parameter of the data object passed to the chart 2016-08-10 09:54:21 -04:00
Zach Panzarino
6e9ee1f137 Merge 'Documentation updates' #3110 2016-08-10 00:12:56 +00:00
Zach Panzarino
57f2d7de58 Update docs and add plugin section (suggested by @simonbrunel) 2016-08-09 14:34:59 +00:00
Tom Loudon
9d055720ab Added section on using patterns to fill datasets chartjs/Chart.js#1323 2016-08-08 17:39:36 +01:00
MatthieuRivaud
d06fbc772f - Added dataset option |cubicInterpolationMode| to allow for curves with different interpolation modes on the same graph (updated doc accordingly) 
- Added new sample file to demonstrate the monotone cubic interpolation mode
- Fixed a typo in a comment in updateBezierControlPoints
 2016-08-08 15:35:46 +02:00
MatthieuRivaud
2409908027 Implement monotone cubic interpolation (see issue #3086). 2016-08-08 14:01:30 +02:00
Zach Panzarino
52667a3d0c Update link pattern for popular extensions 2016-08-08 03:31:15 +00:00
Zach Panzarino
660c3850d7 Documentation updates 
Adds a lot of new information to the docs that will help developers better utilize the entire Chart.js library

List of implemented changes:
 - Reverse option for legends (resolves #3102)
 - Information about chart resizing (resolves #3023)
 - Mixed chart types (resolves #2825) (resolves #2431)
 - Chart library comparison table (resolves #2605)
 - getDetasetMeta function information (resolves #2521)
 - Popular Extensions (resolves #2365)
 2016-08-08 03:08:13 +00:00
laviniaclare
ad17f9a1bf changed 'chart there are' to 'charts there are' 2016-08-05 11:51:55 -07:00
djhuistra
67634b081a Chart.pluginService -> Chart.plugins in documentation 
Apparently Chart.pluginService is deprecated, but this name is still used in the documentation. I suggest to update it :)
 2016-08-03 21:06:21 +02:00
Siben Nayak
71ede8d52c Docs: Apply a recommendation (fixes #3046) 2016-08-01 15:26:46 +05:30
Evert Timberg
8e3abe10aa Fix docs typo 2016-07-30 09:02:40 -04:00
Ben Davison
5e69ecc309 small typo 
This should either be "rgb(0, 0, 0)" or "rgba(0, 0, 0, 0.1)". However, based on the default value it should be the latter.
 2016-07-29 10:56:59 +01:00
mdewilde
548f07e9cd Correct probable copy paste issue 2016-07-28 13:20:18 +02:00
mdewilde
08451ce95e Correct duplicate error 2016-07-28 13:16:21 +02:00
Neabfi
29a1ba10e4 Correction of spelling mistake 2016-07-25 10:53:28 -04:00
Neabfi
a2977ecfcd Correction of spelling mistake 2016-07-25 10:50:35 -04:00
Evert Timberg
e94d3c0730 Merge pull request #2947 from chartjs/fix/524 
Add polar area start angle setting
 2016-07-19 18:56:09 -04:00
Nick Downie
0c07b1eeda Fix missing comma syntax error in js block 2016-07-19 22:01:41 +01:00
Evert Timberg
88d9398982 Merge pull request #2984 from slinhart/master 
Issue #1012. Added offsetAngle option for radar charts.
 2016-07-18 22:25:54 -04:00
unknown
1a63113bc0 changed option name for radar chart from offsetAngle to startAngle. Added test to make sure correct angles are computed for all points in the radar chart (with and without startAngle option set). 2016-07-17 23:11:30 -06:00
Siben Nayak
d50cdfe6ad FIx the Pie Chart hover issue (#2983) 2016-07-17 19:04:47 +05:30
unknown
d7733b2221 Merge remote-tracking branch 'chartjs-origin/master' 2016-07-16 18:59:22 -06:00
unknown
ad7ed249af Add an option for radar chart to have offsetAngle. Issue #1012 2016-07-16 18:58:04 -06:00
Evert Timberg
7930137afa Merge pull request #2925 from Joshuabaker2/master 
Ability to manually set bar chart bar width
 2016-07-16 14:46:59 -04:00
Michael Oberwasserlechner
0b0a3c9ccd Docs for Title and Legend position incomplete 
Positioning of title and legend to the left or to the right works.
 2016-07-14 12:30:34 +02:00
Michael Oberwasserlechner
281ad20452 Fix copy typo 2016-07-13 08:49:42 +02:00
Josh Baker
191c280387 Added support for manually specifying bar thickness in bar charts 2016-07-12 17:31:50 -07:00
zachpanz88
885eeb091a
Update link to Colors in documentation for each chart type 2016-07-12 11:33:48 -04:00
Evert Timberg
49c4169010 Bring back capping of bezier curve points and have an option to disable it (#2948) 2016-07-09 15:24:41 -06:00
Evert Timberg
b6686f00f4 Non numeric y (#2849) 
* Category scale can now read from the xLabels and yLabels properties.

* Update docs with section regarding the data object.

* Add sample file with non numeric Y and fix animations
 2016-07-09 09:22:25 -06:00
Evert Timberg
72813d5112 Merge branch 'amlethojalen-master' 2016-07-09 10:02:08 -04:00
Evert Timberg
6f392639c2 Merge branch 'master' of https://github.com/amlethojalen/Chart.js into amlethojalen-master 2016-07-09 09:39:43 -04:00
Evert Timberg
fc09b58a14 Merge pull request #2905 from shuson/patch-1 
add wikipedia link for DRY explanation
 2016-07-09 09:12:32 -04:00
Evert Timberg
a452094f5d Add polar area start angle setting 2016-07-09 09:05:02 -04:00
gitname
046e2effb5 Fix typo 2016-07-07 12:57:49 -07:00
amlethojalen
988423b05e Fixed up formatting suggestions/issues as per comments from zachpanz88 2016-07-07 08:35:21 +10:00
Shayne Linhart
0dccc85e3a Added usePointStyle option to label boxes 
- Closes #2252
- Allows label boxes to match the shape(pointStyle) of the corresponding data.
* Removed unused varaible from legend's draw()
 2016-07-05 20:08:29 -06:00
amlethojalen
68728fc9a7 Added ability to render a line chart as a stepped line chart. 
Added option.elements.line.stepped
Added dataset.steppedLine
Added Sample, and updated documentation.
 2016-07-06 11:13:12 +10:00
amlethojalen
bddc870201 Added ability for drawing a Line Chart as a stepped Line Chart. (reverted from commit efd06c886d) 2016-07-06 10:25:01 +10:00
amlethojalen
efd06c886d Added ability for drawing a Line Chart as a stepped Line Chart. 2016-07-05 19:50:53 +10:00
Shusen Wang
ff9e9f1d7c add wikipedia link for DRY explanation 
DRY is a short term for Don't Repeat yourself, maybe it is not so well known by front-end developers, but it is well known among back end developers
 2016-07-04 14:51:26 +08:00
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