Evert Timberg
|
12e2ace039
|
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0dev-xy
Conflicts:
src/Chart.Core.js
Fixed the sample files & chart type initialize methods so that this.data does not get set to undefined.
|
2015-05-20 09:03:22 -04:00 |
|
Evert Timberg
|
008bb1aab3
|
Set new tooltip templates for the scatter chart
|
2015-05-19 20:33:39 -04:00 |
|
etimberg
|
676765e808
|
Initial config merge. Handles special cases for objects and arrays and merges smarter than simply replacing the default object. Tested by overriding the vertical axis 0 point colour. Also implemented dataset axis binding. If nothing is specified, the dataset is bound to the first x and y axis.
|
2015-05-18 14:19:34 -04:00 |
|
Evert Timberg
|
e30a9d2a94
|
The scatter example page now has negative numbers in both directions
|
2015-05-18 08:44:06 -04:00 |
|
Evert Timberg
|
d7ad5b6340
|
Add a scatter chart sample
|
2015-05-17 13:19:37 -04:00 |
|