Skip to content
This repository was archived by the owner on Jul 19, 2019. It is now read-only.

Commit 1a28230

Browse files
committed
refactor to only use CommonJS
1 parent 754b219 commit 1a28230

File tree

13 files changed

+19
-397
lines changed

13 files changed

+19
-397
lines changed

README.md

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,16 @@ rich interactive react charting components using [chart.js](http://www.chartjs.o
1414

1515
Installation
1616
------------
17-
### Browser
17+
This is a CommonJS component only (to be used with something like Webpack or Browserify)
1818
```
19-
<!-- chart.js must be loaded before react-chartjs -->
20-
<script src="path/to/chart.js"></script>
21-
<script src="path/to/react-chartjs.js"></script>
22-
```
23-
24-
### CommonJS
25-
```
26-
// nothing you need to do here for initialization
27-
```
28-
29-
### AMD
30-
```
31-
define('path/to/chart.js', 'react', 'react-chartjs', function(Chart, React, ReactChart) {
32-
// initialize ReactChartjs
33-
ReactChart(Chart, React);
34-
/// now you can refer to React charts as Chart.React.*
35-
});
19+
npm install --save react-chartjs
3620
```
21+
You must also include the [chartjs](http://www.chartjs.org/) script on your html page
3722

3823
Example Usage
3924
-------------
4025
```
41-
var LineChart = Chart.React.Line; // for browser or AMD (using define('path/to/chart.js'))
42-
var LineChart = require("react-chartjs/line"); // for commonJS
26+
var LineChart = require("react-chartjs").Line;
4327
4428
var MyComponent = React.createClass({
4529
render: function() {

bower.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

index.js

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
1-
(function(main) {
2-
if (typeof Chart === 'function') {
3-
// script include
4-
main(Chart);
5-
} else {
6-
// AMD
7-
define([], function() {
8-
return main;
9-
});
10-
}
11-
})(function(Chart, React) {
12-
require('./vars').React = React;
13-
Chart.React = {
14-
Bar: require('./bar'),
15-
Doughnut: require('./doughnut'),
16-
Line: require('./line'),
17-
Pie: require('./pie'),
18-
PolarArea: require('./polar-area'),
19-
Radar: require('./radar')
20-
};
21-
return Chart;
22-
});
23-
1+
module.exports = {
2+
Bar: require('./lib/bar'),
3+
Doughnut: require('./lib/doughnut'),
4+
Line: require('./lib/line'),
5+
Pie: require('./lib/pie'),
6+
PolarArea: require('./lib/polar-area'),
7+
Radar: require('./lib/radar')
8+
};

bar.js renamed to lib/bar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
var vars = require('./vars');
1+
var vars = require('./core');
22

33
module.exports = vars.createClass('Bar', ['getBarsAtEvent']);

vars.js renamed to lib/core.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,7 @@ module.exports = {
5555
}
5656
}
5757

58-
var React = this.React || global.React;
59-
if (!React && (typeof require !== 'undefined') && (typeof define !== 'function')) {
60-
// allow the charts to not need to be initialized for commonJS
61-
React = this.React = require('react');
62-
}
63-
if (!React) {
64-
throw new Error("The charts were not initialized with the React instance");
65-
}
66-
58+
var React = require('react');
6759
return React.createClass(classData);
6860
}
6961
};
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
var vars = require('./vars');
1+
var vars = require('./core');
22

33
module.exports = vars.createClass('Doughnut', ['getSegmentsAtEvent']);

line.js renamed to lib/line.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
var vars = require('./vars');
1+
var vars = require('./core');
22

33
module.exports = vars.createClass('Line', ['getPointsAtEvent']);

pie.js renamed to lib/pie.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
var vars = require('./vars');
1+
var vars = require('./core');
22

33
module.exports = vars.createClass('Pie', ['getSegmentsAtEvent']);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
var vars = require('./vars');
1+
var vars = require('./core');
22

33
module.exports = vars.createClass('PolarArea', ['getSegmentsAtEvent']);

radar.js renamed to lib/radar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
var vars = require('./vars');
1+
var vars = require('./core');
22

33
module.exports = vars.createClass('Radar', ['getPointsAtEvent']);

0 commit comments

Comments
 (0)