Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 20:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,645 Commits 8 Branches 114 Tags 67 MiB
04d4adda05
Commit Graph

781 Commits

Author SHA1 Message Date
Tanner Linsley
50d0c98030 Tooltips now respect stacked ordering 
Tooltips detect the stacked scale property now, reversing when
appropriate
 2016-02-17 12:42:29 -07:00
Tanner Linsley
ee81d4a804 Reversible Legends 
Legends can now be reversed with the `reversed: true` property.
 2016-02-17 12:42:09 -07:00
Tanner Linsley
ac5be9bde2 Proper line and bar stacking order 
Stacked line and bar charts now behave predictably with the first
dataset on the bottom stacked upwards.
 2016-02-17 12:41:32 -07:00
Evert Timberg
4c35bba639 When the last label would overlap with the previously shown label, skip the previously shown one 2016-02-15 10:43:19 -05:00
Evert Timberg
309ab1f477 Disable autoskipper for time scales 2016-02-15 09:41:35 -05:00
Evert Timberg
37b3fb5d6c Legend tests + fix minor bug where padding was not taken into account when going down to the next line 2016-02-15 09:23:31 -05:00
Evert Timberg
e589734cbb Title block tests 2016-02-14 18:04:12 -05:00
etimberg
01b88f19df Clean up code climate style issues and formatting. 2016-02-14 17:06:00 -05:00
etimberg
f6951816a0 Improve joshing reporting. Added a JSHint config file. 
Fixed JSHint warnings.
 2016-02-13 20:12:26 -05:00
Tanner Linsley
eb01a0d6f8 Core helpers reference 2016-02-11 23:45:14 -07:00
Tanner Linsley
813d18bd78 Passing All Tests, Updated Dependencies 2016-02-11 23:16:43 -07:00
Tanner Linsley
007d029837 Bundled builds 
Possible usages are:

src/Chart.js (umd)
dist/Chart.js (ChartJS)
dist/Chart.min.js (ChartJS minified)
dist/Chart.bundle.js (ChartJS with Moment.js)
dist/Chart.bundle.min.js (ChartJS with Moment.js minified)
 2016-02-11 21:29:26 -07:00
Tanner Linsley
f2780bb825 Browserify for easier UMD consumptions and vanilla builds 2016-02-11 20:30:53 -07: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
Evert Timberg
61ca178e2b Write an almost equals function and use it in the linear scale. Added a test for this new function. 2016-02-06 09:38:44 -05:00
Robert Becker
1692b977cd Fixed tab sizing in core.helpers.js 2016-02-05 09:43:20 +01:00
Robert Becker
098b05f1b2 Further reformatted scale.linear.js to match original indenting. 
Refactored and fixed scale calculation.
Added dist files to commit.
 2016-02-05 09:41:45 +01:00
Robert Becker
85de9fbe9c Further reformatted scale.linear.js to match original indenting. 2016-02-05 09:33:57 +01:00
Robert Becker
80ede9b9bb Added documentation for fixedStepSize. 
Reformatted scale.linear.js to match original indenting.
 2016-02-05 09:28:50 +01:00
Robert Becker
09721407d2 Removed debug log. 2016-02-04 15:28:06 +01:00
Robert Becker
9a20381af4 Fixed typo in core.helpers.js. 
Added ticks.fixedStepSize configuration parameter to force linear scale steps.
 2016-02-04 15:20:17 +01:00
Robert Becker
ba6afa7257 Fixed label callbacks adding only a single line instead of multiple lines as stated in docs. 2016-02-04 10:35:53 +01:00
Evert Timberg
dfaf786e1a Always show lines by default. 2016-02-02 20:14:59 -05:00
Evert Timberg
d16f4fc5ce Add default font options 2016-02-01 21:06:54 -05:00
Evert Timberg
0e8babf1d7 Fix stacked bar data limit calculation 2016-02-01 18:44:39 -05:00
Evert Timberg
172c088c6b Minor fix 2016-01-30 17:19:32 -05:00
Evert Timberg
f75116a91e Update millisecond default format. Removed unnecessary space at right edge of time scale. 2016-01-30 16:35:10 -05:00
Evert Timberg
bfd6f5f78e Radar controller tests 2016-01-27 18:00:32 -05:00
Evert Timberg
d0a0d57fe2 Initial polar area tests 2016-01-24 13:29:13 -05:00
Evert Timberg
6aa2933ec5 Bubble controller tests 2016-01-24 10:59:19 -05:00
Evert Timberg
d0b67c603b Line and bar test updates 2016-01-24 10:58:30 -05:00
Evert Timberg
68ab74a46d Fix linear scale stacked mode 2016-01-24 09:22:28 -05:00
Evert Timberg
0ed39c9fd7 Fix error in math helpers. 2016-01-24 09:21:10 -05:00
Evert Timberg
c312835eb1 Add some tests for scales. Cleaned up some minor bugs in the time scale. Wrote better helpers for helpers.min and helpers.max 2016-01-23 12:44:55 -05:00
Evert Timberg
59e3ccb42a buildOrUpdateControllers now returns an array of all the new controllers that were created. Build controllers before updating the scales but only reset them afterwards because the scales need to update label moments first. 2016-01-21 22:00:21 -05:00
Evert Timberg
2d4e2f9889 Properly begin path before drawing line at edge of scale 2016-01-18 21:35:35 -05:00
Evert Timberg
62988e9768 Merge pull request #1912 from mathiask88/pointStyleFix 
Fixes the point size for rect and rectRot
 2016-01-18 15:55:06 -05:00
Mathias Küsel
b282a01ab6 Fixes rect size 2016-01-18 20:04:31 +01:00
Mathias Küsel
33303d8d8a Fixes resize() function 2016-01-18 17:46:11 +01:00
Evert Timberg
1de0435feb Fix reversed ticks on linear scale + update test 2016-01-17 20:37:43 -05:00
Mathias Küsel
655c1152eb Adds different point styles 2016-01-16 18:07:57 +01:00
Mathias Küsel
c42cb148da Transition optimizations 2016-01-15 13:06:03 +01:00
Mathias Küsel
fa7baa1627 Do not calculate control points if we want straight lines 2016-01-15 13:05:51 +01:00
Mathias Küsel
19613f531c Just assign instead of extend 2016-01-15 13:05:23 +01:00
Mathias Küsel
4f6e86640f Adds a caching system to expensive measureText() function 2016-01-15 13:05:03 +01:00
Mathias Küsel
25d6c2f064 Removes unused context bindings 2016-01-14 18:17:14 +01:00
Evert Timberg
b756507625 Merge pull request #1887 from mathiask88/v2.0-dev 
Add option to disable line drawing
 2016-01-14 11:02:51 -05:00
Mathias Küsel
24e4a924c4 Add option to disable line drawing 2016-01-14 13:39:06 +01:00
Evert Timberg
7735371f45 Merge pull request #1893 from mathiask88/updateOptimizations 
Add some optimizations to often used functions
 2016-01-12 08:22:36 -05:00
Mathias Küsel
977d45a3e0 Add some optimizations to often used functions 2016-01-12 09:47:55 +01:00
Davis Kim
88fc6ecc5c Fix orf/olf being undefined 2016-01-11 18:54:45 -08:00
Evert Timberg
0ed27d4474 Make sure tick string could be null / undefined 2016-01-09 14:42:55 -05:00
Evert Timberg
5070059ac1 Add template option for point labels + test + doc update 2016-01-09 14:39:43 -05:00
Evert Timberg
8c68f78ec3 Don't try to use undefined Scale constructors 2016-01-09 11:55:44 -05:00
Evert Timberg
0e393a3122 Update controllers 2016-01-09 09:50:56 -05:00
Evert Timberg
8cfa60c04d Merge pull request #1854 from nnnick/fix/1853 
Do not force resize if the size has not changed
 2016-01-08 13:16:06 -05:00
Morley Zhi
203bbcec6c Fix a bug where ticks get culled when they don't need to be 2016-01-07 15:57:53 -05:00
Morley Zhi
fe57c8728e Re-enable this; turns out I was mislead by the label spacing 2016-01-07 12:41:42 -05:00
Morley Zhi
ebf695734c Looks like maxTicksLimit already limits gridlines, so restore this 2016-01-07 12:37:13 -05:00
Morley Zhi
f00517643e Always show the last tick 2016-01-07 12:28:09 -05: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
310eada01a Do not force resize if the size has not changed 2016-01-05 20:16:18 -05:00
etimberg
8dca052a16 Add suggestedMin, suggestedMax, min, and max options to radialLinear scale 2016-01-02 21:03:09 -05:00
Evert Timberg
579e322809 Merge pull request #1840 from nnnick/fix/1731-part-2 
Better handling of large tooltips
 2016-01-02 20:16:37 -05:00
etimberg
97cc714c94 Don't draw bars that represent data that is not valid (null, undefined, or NaN) 2015-12-31 19:32:03 -05:00
etimberg
a9a003c4c4 clean up helpers file before starting work 2015-12-31 18:41:21 -05:00
Evert Timberg
d9cc1219ce Better handling of large tooltips 2015-12-29 12:58:53 -05:00
Evert Timberg
824f5880fb Merge pull request #1837 from nnnick/fix/1766 
Better fitting of scales
 2015-12-29 10:16:46 -05:00
Evert Timberg
d6a27d8eb3 Clean up code 2015-12-29 09:56:55 -05:00
Evert Timberg
0c534e1eb8 Fix layout service 2015-12-29 09:07:01 -05:00
Evert Timberg
754268890b Alias the pixel for nicer drawing 2015-12-28 09:37:31 -05:00
Evert Timberg
f2899934db Draw line at edge of scales & update tests 2015-12-28 09:26:59 -05:00
etimberg
ff11975648 Fix issues identified in PR 2015-12-27 11:48:14 -05:00
Tore Lervik
a0c359ee80 min/max should have precedence over suggestedMin/suggestedMax 2015-12-25 13:53:09 +01:00
Tanner Linsley
31721a353c Merge pull request #1829 from nnnick/fix/1716-1731 
Better tooltip positioning
 2015-12-23 10:22:34 -07:00
Evert Timberg
968a11a631 Merge pull request #1826 from hallatore/Bug_BezierCurveAtZero 
Fixed bug with bezier still being used with tension set to 0
 2015-12-23 09:39:21 -05:00
Tore Lervik
a1940caf91 Fixed build error bug with getting tension 2015-12-23 15:29:25 +01:00
Tore Lervik
ad67d1ecf8 Fixed bug with skipRatio check not being triggered correctly. 2015-12-23 13:42:24 +01:00
Tore Lervik
2c178a5670 Fixed bug with bezier still being used with tension set to 0 2015-12-23 13:36:44 +01:00
Evert Timberg
f170fd1b8d Improvements to tooltip alignment to avoid the canvas edges 2015-12-22 21:35:23 -05:00
Evert Timberg
a423542775 Fix tests 2015-12-22 09:13:02 -05:00
Evert Timberg
fd668086b2 Merge pull request #1816 from hallatore/Bug_AutoSkip 
Refactored skipRatio to use the longest label text for calculation.
 2015-12-22 08:19:25 -05:00
Tore Lervik
d134394a1d Refactored out property 2015-12-21 23:37:09 +01:00
Tore Lervik
cd02434943 Refactored skipRatio to use the longest label text for calculation. 2015-12-21 23:32:52 +01:00
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
Evert Timberg
d7643bf865 Initial refactor of tooltip code 2015-12-21 15:52:33 -05:00
Evert Timberg
d26ab24e3c Show rectangle points at end of bars, even negative ones. 2015-12-21 15:52:19 -05: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
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
Evert Timberg
bafd36b5ec Fix sizing of tooltip when beforeBody or afterBody is very line 2015-12-20 18:48:44 -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
Mattias Lyckne
23b2d991f7 disable autoSkip when there is a userCallback or autoSkip is set to false 2015-12-18 16:18:49 +01: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
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
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
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
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
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
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
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
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
Evert Timberg
b0f69a1092 Generate nice legend boxes for all current chart types 2015-12-07 19:11:54 -05:00
Evert Timberg
ffa2870b56 Fix a few more issues in the tooltips 2015-12-07 18:23:51 -05:00
Evert Timberg
1cb7dde0d5 Start fixing code climate issues 2015-12-07 18:19:56 -05:00
Evert Timberg
20b9395585 Merge pull request #1745 from nnnick/fix/1710 
Remove unused tooltip options
 2015-12-07 17:46:49 -05:00
Evert Timberg
bffbaf6b37 Generate label strings using an option function. This allows new chart types to override 2015-12-06 12:53:45 -05:00
Evert Timberg
eba2fce923 Docs + move defaults to correct place. 2015-12-06 11:19:55 -05:00
Evert Timberg
792ee587ae Split legend and title block functionality into 2 separate blocks. This allows the title to be on the top of the chart while the legend is on the bottom 2015-12-06 10:20:38 -05:00
Evert Timberg
eaf183352c Polar are controller needs a similar update to the doughnut controller 2015-12-06 10:19:09 -05:00
Evert Timberg
7ab2a5ed9a Remove unused xOffset property from the tooltip. Use the multiKeyBackground. Update documentation accordingly. 2015-12-06 09:38:19 -05:00
Evert Timberg
28fc6841f3 Add tooltipFormat option to time scale options. 
Fix bars when displayed on a time scale.
Updated sample files.
 2015-12-05 19:33:33 -05:00
Evert Timberg
0c247dde28 Gracefully handle setting options.animation to false which occurs when migrating configs from v1. 2015-12-05 10:40:05 -05:00
Evert Timberg
784fa78267 Merge pull request #1738 from nnnick/fix/1735 
Call `beforeBody` and `afterBody` using the correct function.
 2015-12-05 10:01:15 -05:00
Evert Timberg
d21b3c6d7e Merge pull request #1741 from nnnick/fix/1706 
Highlight correct items in dataset mode
 2015-12-05 10:01:03 -05:00
Evert Timberg
2f1006c6de Make sure we always have a valid end angle when reseting the model. Previously this was undefined and interpreted as 0 in the animation code. 2015-12-05 09:39:25 -05:00
Evert Timberg
744e1429b9 Label polar area and doughnut datasets 2015-12-04 20:32:18 -05:00
Evert Timberg
59fb1696a8 Highlight correct items when hover mode is set to 'dataset' 2015-12-04 20:01:04 -05:00
Evert Timberg
38afefde25 Doughnut controller needs to obey chart area size 2015-12-04 19:22:48 -05:00
Evert Timberg
d905f19355 Fix draw issue when radar chart dataset has 0 points and hence no children 2015-12-03 22:04:00 -05:00
Evert Timberg
0b260d57cc Fix JSHint issue 2015-12-03 21:25:36 -05:00
Evert Timberg
dcc06eb3bb Merge branch 'v2.0-dev' into v2.0-legend 
Conflicts:
	src/core/core.scaleService.js
 2015-12-03 21:21:10 -05:00
Evert Timberg
0a92cf1b40 Call beforeBody and afterBody using the correct function. 2015-12-03 18:46:21 -05:00
Tanner Linsley
62bc4e42ec Merge pull request #1736 from nnnick/umd-build 
Umd build
 2015-12-02 20:37:04 -07:00
etimberg
95a172df06 Remove old and stuff. Use the correct color variable instead of window.color 2015-12-02 22:15:03 -05:00
etimberg
40c8289ce8 Time scale uses moment loaded through UMD 2015-12-02 21:10:51 -05:00
Evert Timberg
14c2cf56d1 Merge pull request #1728 from ashayas/bugfix/1722 
Realized minRotation not needed, removed as an option and removed from tests
 2015-12-02 07:30:55 -05:00
npsecoding
164671ffeb Realized minRotaion not needed, removed as an option and removed from tests 2015-12-01 22:29:19 -08:00
etimberg
25f061f340 Fix test failures 2015-12-01 21:07:53 -05:00
etimberg
bf277473c6 Update scale fitting to prevent horizontal scales from jumping around. 2015-12-01 21:01:13 -05:00
etimberg
6b3fd19fa9 Time scale will now scale units. For example, it will try 1hr then 2hrs then 3 hrs then 6 hrs then 12 hrs ... until it finds a unit that fits. 2015-12-01 20:02:44 -05:00
etimberg
f609452727 Allow the user to change the time label display formats 2015-11-30 20:42:48 -05:00
Evert Timberg
e91e6be851 Merge pull request #1696 from nnnick/fix/1688 
When tooltip opacity is less than 1e-3, round to 0.
 2015-11-29 10:16:25 -05:00
Evert Timberg
349586e14c Merge pull request #1695 from nnnick/fix/consistent-display-parameters 
Fix inconsistent display parameters
 2015-11-29 10:16:20 -05:00
wuchangming
7aa2fd1af3 Bug in handler event.type='touchend' 
In Chorme.
while event.type = "touchend” ,  event.touches is a empty TouchList,
event.touches.length === 0
 2015-11-27 11:16:54 +08:00