Skip to content

Commit

Permalink
Merge pull request #81 from maxwondercorn/master
Browse files Browse the repository at this point in the history
added c3 interaction property
  • Loading branch information
maxwondercorn authored Nov 6, 2018
2 parents c06f071 + 2d456f4 commit 7ca4573
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Ember-C3

## THIS README IS FOR A FUTURE VERSION - See branch old-v031 for current published version
### THIS ADDON IS GOING THROUGH MAJOR UPDATES - The current version 0.3.1 published to NPM is the latest version. Work is being done on master - v0.3.1 can be found [here](https://github.com/Glavin001/ember-c3/tree/old-v031)

### The readme below does not reflect the current published version. See issue [#77](https://github.com/Glavin001/ember-c3/issues/77) for upgrade checklist

[![npm version](https://badge.fury.io/js/ember-c3.svg)](http://badge.fury.io/js/ember-c3)
[![Join the chat at https://gitter.im/Glavin001/ember-c3](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Glavin001/ember-c3?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Expand Down Expand Up @@ -70,6 +72,7 @@ See http://c3js.org/examples.html for examples of how to use C3.
grid=grid
legend=legend
tooltip=tooltip
interaction=interaction
subchart=subchart
zoom=zoom
point=point
Expand Down Expand Up @@ -111,6 +114,7 @@ c3chart | Points to the C3 chart generated by the component. Any C3 api method
grid | Used to show, hide and modify the graph grid. See [docs](https://c3js.org/reference.html#grid-x-show)
legend | Show, hide and modify the legend position. See [docs](https://c3js.org/reference.html#legend-show)
tooltip | Show, hide and modify the tooltip. See [docs](https://c3js.org/reference.html#tooltip-show)
interaction | Enable or disable [interactions](https://c3js.org/reference.html#interaction-enabled) | interaction: { enabled: false }
subchart | Show, hide and modify C3 sub charts. See [docs](https://c3js.org/reference.html#subchart-show)
zoom | Set C3 zoom features. See [docs](https://c3js.org/reference.html#zoom-enabled)
size | Control chart size see [docs](https://c3js.org/reference.html#size-width) | size: {width: 640 }
Expand Down
2 changes: 1 addition & 1 deletion addon/components/c3-chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default Component.extend({
"data", "line", "bar", "pie", "donut", "gauge",
"grid", "legend", "tooltip", "subchart", "zoom",
"point", "axis", "regions", "area", "size",
"padding", "color", "transition", "title"
"padding", "color", "transition", "title", "interaction"
];

// get base c3 properties
Expand Down

0 comments on commit 7ca4573

Please sign in to comment.