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

1018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tore Lervik
c078ae15f0 Fixed a typo 2015-12-21 22:43:20 +01:00
Tore Lervik
86ca455cb6 Refactored firstTick null check 2015-12-21 22:40:33 +01:00
Tore Lervik
477fc72693 firstTick and lastTick can be null if the chart is empty. 2015-12-21 22:34:31 +01:00
Tore Lervik
3577d959d0 Have to check for undefined because "if (0.0)" would equal false. 2015-12-21 20:28:20 +01: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
Mattias Lyckne
7363c6fcbe Dont set autoSkip false if userCallback is defined 
”The reason being is that the user could replace either callback or
userCallbac”
 2015-12-21 13:59:29 +01:00
Mattias Lyckne
dec4a5f57a Fix tests 2015-12-21 08:43:48 +01:00
Evert Timberg
d163122536 Merge pull request #1808 from nnnick/fix/1737 
Fix sizing of tooltip when beforeBody or afterBody is very long
 2015-12-20 18:51:24 -05:00
Evert Timberg
bafd36b5ec Fix sizing of tooltip when beforeBody or afterBody is very line 2015-12-20 18:48:44 -05:00
Evert Timberg
ae643d3d76 Update built files 2015-12-20 18:31:49 -05:00
Evert Timberg
5f4e8a4c13 Merge pull request #1794 from nnnick/update-scale-lifecycle 
Update Scale Lifcycle
 2015-12-19 14:29:49 -05:00
Evert Timberg
29770d3e67 Merge pull request #1802 from akagroundhog/v2.0-dev 
xPadding/yPadding fix in 00-Getting-Started.md
 2015-12-18 17:43:07 -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
Mattias Lyckne
23b2d991f7 disable autoSkip when there is a userCallback or autoSkip is set to false 2015-12-18 16:18:49 +01:00
Evert Timberg
d295e49907 Merge pull request #1797 from xriss/patch-1 
maxRotation test is off by one
 2015-12-17 17:04:42 -05:00
Kriss
d9363d637a maxRotation test is off by one 
Most notable when maxRotation=0 and you end up with the text becoming non centred as it has rotated it by 1 and switched to right alligned mode.
 2015-12-17 22:00:12 +00:00
Evert Timberg
f7d3ea3841 Merge pull request #1788 from nnnick/fix/extended-bars 
Better extensions of bar controllers
 2015-12-17 09:36:15 -05:00
Evert Timberg
283f1d7387 Update check to new system + fix tests 2015-12-17 09:31:01 -05: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
etimberg
8efa577ef5 Bar dataset controller needs a better way to know which datasets are bars since users could make their own bar types. 2015-12-15 20:13:37 -05:00
Evert Timberg
3ccf3fd249 Merge pull request #1787 from nnnick/fix/min-max 
Updates new min/max settings
 2015-12-15 19:35:46 -05:00
Evert Timberg
cddfba1676 Better test 2015-12-15 19:33:38 -05:00
Evert Timberg
274897fc24 Fix tests 2015-12-15 19:30:09 -05:00
Evert Timberg
f51d7753bd Update logarithmic algorithm 2015-12-15 19:18:18 -05:00
Evert Timberg
3e3912973c Slight improvement to new min/max options so that linear scales look right 2015-12-15 18:58:05 -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
Evert Timberg
1170ab5481 Merge pull request #1778 from nnnick/fix/1582 
Update docs for polar area / doughnut charts + extending chart.js
 2015-12-13 16:54:20 -05:00
Evert Timberg
c2ee14dec9 Update docs. Improved pie / polar area docs. Updated advanced docs regarding extending scales / chart types 2015-12-13 15:29:57 -05:00
Evert Timberg
139cbe1c64 All dataset controllers now inherit from a common base class Chart.DatasetController. This makes writing external controllers much easier 2015-12-13 14:35:40 -05:00
Evert Timberg
1854ea086c Merge pull request #1775 from nnnick/fix/1711 
Call animation callbacks.
 2015-12-12 10:12:49 -05:00
Evert Timberg
716e303230 Call animation callbacks. Created a sample file that shows their use by updating a progress bar during the animation. Updated the documentation to show how they are called. 2015-12-12 10:01:08 -05:00
Evert Timberg
47d04ced8f Merge pull request #1755 from nnnick/fix/1725 
Build controllers before scales are updated to ensure scale IDs are correct
 2015-12-12 09:05:39 -05:00
Evert Timberg
95332e39f5 Merge branch 'v2.0-dev' into fix/1725 
Conflicts:
	src/core/core.controller.js
 2015-12-12 09:01:59 -05:00
Evert Timberg
ae3025a2e1 Merge pull request #1774 from nnnick/fix/1762 
Handle tension being set to 0 properly
 2015-12-12 08:56:10 -05:00
Evert Timberg
39e5daaca8 Better property picking. Added a helper function so we don't have to write a complicated ternary everywhere. Updated tests accordingly. 2015-12-12 08:52:06 -05:00
Derek Perkins
4add69432f Merge pull request #1750 from nnnick/v2.0-legend 
Legend and Title Support
 2015-12-11 18:52:26 -07:00
Derek Perkins
7825ee5ef2 Merge pull request #1770 from dchesterton/patch-1 
Lowercase NPM package name
 2015-12-11 18:51:21 -07:00
Daniel Chesterton
4eed79ee52 Lowercase NPM package name 2015-12-11 23:58:56 +00:00
Evert Timberg
571120d650 Merge pull request #1756 from nnnick/fix/code-climate 
Fix up issues in core scale
 2015-12-08 21:49:33 -05:00
Evert Timberg
7999aab26a Fix up issues in core scale 2015-12-08 20:22:02 -05:00
Evert Timberg
d689e0fc47 When only the dataset array changes scales did not update correctly. This was due to the fact that the new datasets did not have scale IDs yet. By building the controllers first, the IDs are mapped if necessary. Then we can correctly update scales. 2015-12-08 19:57:58 -05:00
Evert Timberg
819f865723 Merge branch 'v2.0-dev' into v2.0-legend 
Conflicts:
	src/controllers/controller.doughnut.js
 2015-12-07 22:10:38 -05:00
Evert Timberg
4f8f182d21 Better sizing when not displaying 2015-12-07 21:58:48 -05:00
Evert Timberg
a2e1a97382 Update docs + remove unused config option since we don't need 2 different callbacks. 2015-12-07 21:52:15 -05:00
Evert Timberg
60920cd75a Polar area legend toggles data 2015-12-07 21:42:58 -05:00
Evert Timberg
59b7927994 Toggling of doughnut items now works 2015-12-07 21:23:20 -05:00
Evert Timberg
8befbbe8f0 Use config onClick function to toggle datasets for bars/lines/radar charts. 2015-12-07 20:36:44 -05:00