Commit Graph

1754 Commits

Author SHA1 Message Date
Evert Timberg
a423542775 Fix tests 2015-12-22 09:13:02 -05:00
Evert Timberg
d5727d7bc0 Merge pull request #1819 from xriss/v2.0-dev
gulp-umd
2015-12-22 08:44:04 -05:00
Kriss
1221d8311a gulp-umd
Explicitly pass root to the factory function.
2015-12-22 13:21:23 +00:00
Evert Timberg
eb61f5c3fc Merge pull request #1817 from prashcr/patch-2
Add missing comma
2015-12-22 08:19:45 -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
Prashanth Chandra
8e7162ca91 Add missing comma 2015-12-22 17:50:11 +08:00
Evert Timberg
923378e2af Merge pull request #1815 from hallatore/Bug_firstTickUndefined
Bug first tick undefined
2015-12-21 19:59:12 -05:00
Tore Lervik
0437968a4e Fixed broken tests 2015-12-21 23:47:38 +01: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
William Entriken
3c6a736413 Merge pull request #1192 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-12-21 16:05:38 -05: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
Evert Timberg
fc3a3aedaf Merge pull request #1814 from hallatore/Bug_SuggestedMinMax
Have to check for undefined because "if (0.0)" would equal false.
2015-12-21 14:43:41 -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
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