Merge pull request #516 from oesmith/gh-pages-cdnjs
Use cdnjs instead of cdn.oesmith.co.uk.
This commit is contained in:
commit
2c372cd29e
|
@ -1,3 +1,2 @@
|
|||
auto: true
|
||||
safe: true
|
||||
pygments: true
|
||||
highlighter: pygments
|
||||
|
|
|
@ -4,13 +4,13 @@ Add **morris.js** and its dependencies ([jQuery](http://jquery.com) &
|
|||
[Raphaël](http://raphaeljs.com)) to your page.
|
||||
|
||||
{% highlight html linenos %}
|
||||
<link rel="stylesheet" href="http://cdn.oesmith.co.uk/morris-{{ page.morris_version}}.css">
|
||||
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/morris.js/{{ page.morris_version }}/morris.css">
|
||||
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
|
||||
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
|
||||
<script src="http://cdn.oesmith.co.uk/morris-{{ page.morris_version }}.min.js"></script>
|
||||
<script src="//cdnjs.cloudflare.com/ajax/libs/morris.js/{{ page.morris_version }}/morris.min.js"></script>
|
||||
{% endhighlight %}
|
||||
|
||||
If you don't want to use the CDN-hosted assets, then you can extract them from
|
||||
the [zip bundle](https://github.com/oesmith/morris.js/archive/{{ page.morris_version }}.zip) and
|
||||
the [zip bundle](https://github.com/morrisjs/morris.js/archive/{{ page.morris_version }}.zip) and
|
||||
upload them to your own site.
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<a class="github-ribbon" href="https://github.com/oesmith/morris.js"><img src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
|
||||
<a class="github-ribbon" href="https://github.com/morrisjs/morris.js"><img src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
|
||||
</div>
|
||||
<div class="container">
|
||||
{{ content }}
|
||||
|
|
|
@ -11,7 +11,7 @@ morris_version: 0.5.1
|
|||
<p>
|
||||
<a href="https://github.com/morrisjs/morris.js/archive/{{ page.morris_version }}.zip" class="btn btn-large btn-primary">Download v{{ page.morris_version }}</a>
|
||||
<br>
|
||||
<a href="#getting_started">or use our CDN</a>
|
||||
<a href="#getting-started">or use cdnjs</a>
|
||||
</p>
|
||||
<ul class="inline buttons">
|
||||
<li>
|
||||
|
|
|
@ -43,7 +43,7 @@ morris_version: 0.5.1
|
|||
<em>
|
||||
Note 2: if you need to update the plot, use the <code>setData</code>
|
||||
method on the object that <code>Morris.Line</code> returns.
|
||||
There's <a href="https://github.com/oesmith/morris.js/blob/master/examples/updating.html">a <code>setData</code> example</a> in the GitHub repo.
|
||||
There's <a href="https://github.com/morrisjs/morris.js/blob/master/examples/updating.html">a <code>setData</code> example</a> in the GitHub repo.
|
||||
</em>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
Loading…
Reference in New Issue