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
Ryo ONODERA
e94bd460a7
Remove Firefox workaround
...
The workaround for older Firefox should be removed, because latest
supported Firefox 38.4.0/42.0 do not require it.
And it has side effect like #1198 or my problem on Kintone on cybozu.com.
2015-12-12 09:00:12 +09: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
Evert Timberg
b0f69a1092
Generate nice legend boxes for all current chart types
2015-12-07 19:11:54 -05:00
Evert Timberg
3b750e7f27
Merge pull request #1749 from nnnick/fix/code-climate
...
Fix some issues found by code climate
2015-12-07 18:26:51 -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
Tanner Linsley
73e9ff44fe
Merge pull request #1744 from nnnick/fix/1466
...
Time Scale Updates for Tooltips
2015-12-07 12:10:12 -07: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
5df23df291
Move time sample files to sub folder
2015-12-05 10:54:45 -05:00
Evert Timberg
52ae1f7d3c
Merge pull request #1743 from nnnick/fix/1576
...
Gracefully handle setting `options.animation` to `false`
2015-12-05 10:44:24 -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
a1e35ade49
Merge pull request #1742 from nnnick/fix/1715
...
Fixes rotational animation of new arcs
2015-12-05 10:00:45 -05:00
Evert Timberg
89da20354c
Fix tests
2015-12-05 09:55:17 -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
d8704ee37d
Add legends to sample files
2015-12-03 22:03:39 -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
etimberg
b388a1e873
Pipe the build through UMD to get proper UMD headers
2015-12-02 21:08:52 -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