README.md in chartjs-ror-2.1.0 vs README.md in chartjs-ror-2.1.1
- old
+ new
@@ -3,14 +3,19 @@
Simplifies using [Chart.js][] in Rails views.
* All of Chart.js's features via one line of Ruby.
* Renders charts on page load rather than DOMContentReady ([reason][browsersupport]).
* Animates unless you have Modernizr and it doesn't detect canvas support ([reason][browsersupport]). You can manually override this.
-* Optional alternative (better?) abscissa scale calculations.
-* Utility method for filling in gaps in integer series.
+* Optional alternative abscissa scale calculations (see [Chart.js#132][calculations]).
+* Optional utility method for filling in gaps in integer series.
+## Current Chart.js version
+
+This gem includes [Chart.js v1.0.1](https://github.com/nnnick/Chart.js/tree/v1.0.1).
+
+
## Installation
Add this line to your application's Gemfile:
gem 'chartjs-ror'
@@ -33,15 +38,33 @@
Each chart type has a corresponding helper for your views. The helper methods take the same arguments as their Javascript counterparts. The `options` are always optional.
```erb
-<%= line_chart data, options %>
-<%= bar_chart data, options %>
-<%= radar_chart data, options %>
-<%= polar_chart data, options %>
-<%= pie_chart data, options %>
-<%= doughnut_chart data, options %>
+<%= line_chart data, options %>
+<%= bar_chart data, options %>
+<%= radar_chart data, options %>
+<%= polar_area_chart data, options %>
+<%= pie_chart data, options %>
+<%= doughnut_chart data, options %>
+```
+
+If you don't want these helpers – perhaps they clash with other methods in your views – add this initializer to your app:
+
+```ruby
+# config/initializers/chartjs.rb
+Chartjs.no_confict!
+```
+
+You can use these helpers instead:
+
+```erb
+<%= chartjs_line_chart data, options %>
+<%= chartjs_bar_chart data, options %>
+<%= chartjs_radar_chart data, options %>
+<%= chartjs_polar_area_chart data, options %>
+<%= chartjs_pie_chart data, options %>
+<%= chartjs_doughnut_chart data, options %>
```
For example, to render a [line chart][linechart] in Javascript:
```javascript