Merge pull request #1382 from bengesoff/patch-1

fixed two typos
This commit is contained in:
Evert Timberg 2015-08-18 10:42:11 -04:00
commit ac360b8dd1

View File

@ -11,14 +11,14 @@ First we need to include the Chart.js library on the page. The library occupies
<script src="Chart.js"></script>
```
Alternatively, if you're using an AMD loader for JavaScript modules, that is also supported in the Chart.js core. Please note: the library will still occupy a global variable of `Chart`, even if it detects `define` and `define.amd`. If this is a problem, you can call `noConflict` to restore the global Chart variable to it's previous owner.
Alternatively, if you're using an AMD loader for JavaScript modules, that is also supported in the Chart.js core. Please note: the library will still occupy a global variable of `Chart`, even if it detects `define` and `define.amd`. If this is a problem, you can call `noConflict` to restore the global Chart variable to its previous owner.
```javascript
// Using requirejs
require(['path/to/Chartjs'], function(Chart){
// Use Chart.js as normal here.
// Chart.noConflict restores the Chart global variable to it's previous owner
// Chart.noConflict restores the Chart global variable to its previous owner
// The function returns what was previously Chart, allowing you to reassign.
var Chartjs = Chart.noConflict();